fixconflict