2nd conflict
resolved conflict