Merge TusharKuwar-details conflict solve

    Signed-off-by: TusharKuwar <[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

Challenges/challenge_17.md

@@ -0,0 +1,19 @@
+## Welcome to Challenge 17
+
+Welcome to the 17th Challenge 
+
+Today we will be leaning how to work with GitHub Desktop
+
+#### Brief Overview
+
+GitHub Desktop is a GUI that empowers *lazy* users who prefer not to work with the CLI to still interface with Git and GitHub.
+To learn more visit: [What the heck is Git GUI](https://help.github.com/en/desktop/getting-started-with-github-desktop)
+
+
+## Tasks
+
+- Download GitHub desktop
+- Create a new repository on GitHub
+- Add anything you want to your repo
+- Follow through all the GitHub workflow you know using the GUI (commit, branching, pulling, pushing etc)
+- Share a screenshot of your experience using github desktop on the issue created in prior challenges

challengers-list.md

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