Set up app.rb file
Fix merge conflicts