Made a different comment
resolved merge conflict