modified hello word with number 1
resolved merge by brute force