resolved conflict issue