created the main.rb
fixed merge