merged app.rb