resolved conflict issues