added my hello message
fixed merge conflict
fixed merge conflict