Resolve Conflict

Author: kishanrajput23

Challenges/challenge_1.md

@@ -5,7 +5,6 @@ We will start off with an easy task.
 
 Task: 
 Create a [new issue](https://github.com/scaleracademy/scaler-september-open-source-challenge/issues/new) on this repository with the following details to be added to the content of the issue: 
-Create a (new issue)[https://github.com/scaleracademy/scaler-september-open-source-challenge/issues/new] on this repository with the following details to be added to the content of the issue: 
 
 ```
 name: Add your name here

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

challengers-list.md

@@ -1,4 +1,5 @@
 # List of challengers
 1. [Mrinal](https://github.com/mrinal1224)
 2. [Shivay](https://github.com/shivaylamba)
-3. [Kishan](https://github.com/kishanrajput23)
+3. [Raghav](https://github.com/raghavdhingra)
+4. [Kishan](https://github.com/kishanrajput23)