Fixed conflict issue