Conflicted copy files removed