Module 7: Handling Merge Conflicts