fixing bugs
resolved merge conflict