changes done to hello also in the master branch
merge conflicts solved