improved hello you example
merge conflict