conflicted file removed