Git Merge Accept Theirs