Change recommended command for upstream merge to git merge --ff (thanks @jackdesbwa )