some conflict?
Merge remote-tracking branch 'origin/master'
strange conflict