Adding a file with my name
Merge branch 'feature1'
Merge remote-tracking branch 'origin/master'