Hot: conflict-resolution