cause conflict with xyz
merge conflict
remove
Merge remote branch 'origin/xyz' into xyz