added some line in the second copy
resolved merge conflict