Don't always use git-merge-recursive because of speed