Merge Conflict Resolver

Merge conflicts occur when Git cannot automatically resolve differences between two commits. Conflict markers look like this:

<<<<<<< HEAD
Your changes
=======
Their changes
>>>>>>> branch-name

• <<<<<<< HEAD - Start of your changes
• ======= - Separator between changes
• >>>>>>> branch - End of incoming changes