add hello world to readme
fix conflict