diff --git a/Gemfile b/Gemfile
index 38c2fa96..346aee78 100644
--- a/Gemfile
+++ b/Gemfile
@@ -76,12 +76,9 @@ group :development, :test do
   gem 'rspec', '>= 3.0.0.beta'
   gem 'rspec-rails', '>= 3.0.0.beta'
   gem 'capybara'
-<<<<<<< HEAD
   gem 'database_cleaner'
   gem 'capybara-webkit'
-=======
   gem 'shoulda'
->>>>>>> 374efd311fb7f82d0e8257a62675a663904708d5
 end
 
 # FIXME: We should use http://weblog.rubyonrails.org/2012/3/21/strong-parameters/ 
diff --git a/app/controllers/admin/conference_controller.rb b/app/controllers/admin/conference_controller.rb
index 81820be6..bc52af9b 100644
--- a/app/controllers/admin/conference_controller.rb
+++ b/app/controllers/admin/conference_controller.rb
@@ -15,13 +15,6 @@ class Admin::ConferenceController < ApplicationController
 
   def create
     @conference = Conference.new(params[:conference])
-<<<<<<< HEAD
-    if @conference.save
-      redirect_to(admin_conference_path(id: @conference.short_title),
-                  notice: 'Conference was successfully created.')
-    else
-      render action: 'new'
-=======
     if @conference.valid?
       @conference.save
       redirect_to(admin_conference_path(id: @conference.short_title),
@@ -29,7 +22,6 @@ class Admin::ConferenceController < ApplicationController
     else
       redirect_to(new_admin_conference_path,
                   flash: { error: @conference.errors.full_messages.join('! ') })
->>>>>>> 374efd311fb7f82d0e8257a62675a663904708d5
     end
   end