Removed conflicted copy from merge