Handle conflict (3)