conflict fixing