added comments
resolved merge conflicts