local commit, do not send
Merge remote-tracking branch 'origin/master'