added my hello message
fixed merge conflict
fixed
fixed
fixed