2nd step a
resolved merge