fix conflicx