delete conflicted part