noted new feature
resolved merge problem