Item13155: fixed clash resolution

still was depending on DNs in some cases