add challenge 16

Signed-off-by: Rishav986 <[email protected]>

Challenges/challenge_16.md

@@ -0,0 +1,14 @@
+## Welcome to Challenge 16
+
+Welcome to the 16th Challenge 
+
+In this 2 part challenge, we will try to emulate and fix merge conflicts via git. 
+
+Today is the second and final part of this challenge: 
+
+Task: 
+1. You will notice that your pull request will have a conflict: <img width="636" alt="image" src="https://user-images.githubusercontent.com/19529592/190574995-0cc506a8-a2fe-4aa4-98bd-4658e8aa2fc1.png">
+
+2. Try to resolve this merge conflict using local git 
+
+3. Once resolved, share screenshot on the github issue created in the previous challenges