Bonus2

[Signior-X]

No marks for Bonus Ones
Conflict resolution!

This Task Can only be done after doing challenge6

1. Go to main branch git checkout main
2. Create a new branch when you are in the main branch using git checkout -b bonus2
3. Now you will be having the challenge6 branch in the local. so run git merge challenge6
4. You will see that a merge conflict has appeared. Your task is to keep the changes with your name.
5. Finally resolve the conflict, add commit and make a PR.