Fixed conflict handling