Removing conflicted copy