modify hello, adding a new line
modify from master
modify from dev2
fixed conflicts
hello return