Merge branch 'scaleracademy:main' into main

Author: sreejasaha19

Challenges/challenge_14.md

@@ -0,0 +1,11 @@
+## Welcome to Challenge 14
+
+Welcome to the 14th Challenge 
+
+Today is the first part of the two challenges related to resolving merge conflicts. You can take a look at [this article](https://www.atlassian.com/git/tutorials/using-branches/merge-conflicts) to learn more about merge conflicts. 
+
+As part of the challenge, try to create a scenario of a merge conflict locally in your system for a project that you can create. 
+
+Task: 
+1. Follow the article shared above and try to reproduce a case of merge conflict in your system for a project and try to resolve it 
+2. Share appropriate screenshot in the issue created in the first challenge. 

Challenges/challenge_15.md

@@ -0,0 +1,15 @@
+## Welcome to Challenge 15
+
+Welcome to the 15th Challenge 
+
+In this 2 part challenge, we will try to emulate and fix merge conflicts via git. 
+
+Today is the first part of this challenge: 
+
+Task: 
+1. Update your Forked Repo From the Original Repo. Also ensure that your branch ``your-user-name-details`` is also synced with the latest changes from the original repository
+
+2. In your branch ``your-user-name-details`` open the add your name to the list of challengers inside the ``challengers-list.md`` file by following the format in the file. 
+
+3. Push your change to reflect in the Pull Request created in previous challenges
+

challengers-list.md

@@ -0,0 +1,3 @@
+# List of challengers
+1. [Mrinal](https://github.com/mrinal1224)
+2. [Shivay](https://github.com/shivaylamba)