resolved conflict 2