fix missed conflict resolution