branch1 commit
branch1 new file
Merge remote-tracking branch 'origin/branch1'