Conflicts: Gemfile app/controllers/tags_controller.rb app/views/layouts/_base_header.html.erb config/routes.rb db/schema.rb