fixed conflicts in app.rb