Fixed conflict problem