Fix bug in _solve_non_slot_operator_slot_conflicts