結果 : what does git merge origin/master do