Fixed bug by adding puts
Resolved merge conflict