bug fixed
resolved merge conflict
release 1.2 - notes