update hello
handle conflicts