Git Merge Overwrite Conflicts