first
commit
Merge remote-tracking branch 'origin/feature1'
commit
Merge pull request #1 from githubserver/master

Master