Update gemfile
add app.rb file
fix app.rb merge conflict