Conflicts: config/routes.rb
Conflicts: Gemfile app/controllers/admin/import_data_controller.rb vendor/built_in_modules/personal_conference/app/models/writing_conference.rb Conflicts: Gemfile app/controllers/admin/import_data_controller.rb