Merge conflict

Signed-off-by: shubhansu-kr <shubhansu2021@gmail.com>

Author: shubhansu-kr

Challenges/challenge_5.md

@@ -1,6 +1,10 @@
 ## Welcome to Challenge 5
 
+<<<<<<< HEAD
 Welcome to the fifth challenge! 
+=======
+Welcome to the fourth challenge! 
+>>>>>>> e5a28d5 (Challenge 5)
 Today's goal is to update your forked repository and then create a Pull Request
 
 Task
@@ -25,4 +29,8 @@ name: your_name
 github_user_name: YOUR-GITHUB-USERNAME
 ---
 ```
+<<<<<<< HEAD
 5. Submit your Pull Request on the main challenge repo.
+=======
+5. Submit your Pull Request
+>>>>>>> e5a28d5 (Challenge 5)