remove conflicted file