Git Merge Overwrite All Changes