adding my hello world feature
resolving merge conflict