updated version history
resolved merge