Delete conflicted file