bug fixes
resolved merge conflict for bug fixes