add hello.rb
delete
merge