added parse to output
resolved merge conflict