fix conflict resolution from previous merge