Default git merge to upstream