...
Merge remote-tracking branch 'origin/master'
UI etc etc
Merge remote-tracking branch 'origin/master'
blah
Merge remote-tracking branch 'origin/master'