resolved conflict notes