Fixed conflict problems