removed some unwanted console.log statements
resolved merge conflicts