How to Handle Merge Conflicts in Git