Make git merge default to upstream branch