merged conflicss