Conflict fixing