fix incomplete conflict resolution