Fixed conflict-2