merge conflict?
...
Merge remote-tracking branch 'origin/mergeconflict'