remove conflict pointers from previous merge