removed conflicted copy