resolfe conflict