remove conflicted copy