edit on local
Merge remote-tracking branch 'origin/master'
conflict resolved