changed hello
resolved conflicts