almost resolved conflict