# Conflicts:
#   Gemfile
#   Gemfile.lock
#   app/models/city.rb
#   db/schema.rb
#   lib/tasks/web_crawler.rake