added debugging code
resolved merge conflict