improved app.rb
Fixed merge conflict