fixed bugs in prod
fixed bug in branch b2
resolved merge conflict