Rm the the duplicate contents.
Rm the the conflicts contents.