delete conflicted file