correctly an erroneous conflict resolution