fixing leftover mergetool text in routes.rb and schema.rb