remove the conflicted parts