make git merge using "theirs" on pull