first commit on local as modified only
Merge remote-tracking branch 'origin/master'