before solving conflict
Merge remote-tracking branch 'origin/master'
after merge