Fixed conflict errors