Resolve Git Merge Conflicts

https://kodekloud-engineer.com/#!/task_review?task_id=60bdb903bb0fd56c3a2feb6e

Please review this task… as I have done right things as per questions. Please see the repo screenshot as referred in task



…](