commit 1@1
commit2@remote1
Merge branch 'origin/master'