removing conflicted copy