New: conflict-resolution