modified hello
solve the conflicts