var i = 1;
Merge remote-tracking branch 'remotes/origin/branch1'
Merge branch 'master' into branch1