Fixed conflict issues