Remove git's merge conflict complaints.