fix conflictsxe