Amit fixed some things
resolved merge conflicts