Resolved the hello.rb conflict in a humorous fashion
resolved conflict in hello.rb, chose funny over angry