Update the answer to problem1
resolved merge conflict in problem1