set default so that git merge defaults to merging upstream changes