Try fixing file conflict in Git