I too added a second comment
resolved merge conflict