resolved conflict README