conflicts recovered