Handle Merge Conflicts