removed weird conflicted copy