made git merge default to upstream