resoling conflicts