app.rb modified
conflicts resolved