Resolve Git Merge Conflicts

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



…](

Solution already provided by one of the community members.

Regards,
KodeKloud Support