local change
Merge remote-tracking branch 'origin/master'
local commit
Merge remote-tracking branch 'origin/master'