removed some conflicted copies.