Fixed conflict bug.