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