Fixed conflict remains