Tagged relationship-conflict-resolution