diff --git a/app/models/conference.rb b/app/models/conference.rb
index 1886c606..2c424202 100644
--- a/app/models/conference.rb
+++ b/app/models/conference.rb
@@ -2,12 +2,10 @@ class Conference < ActiveRecord::Base
   attr_accessible :title, :short_title, :social_tag, :contact_email, :timezone, :html_export_path,
                   :start_date, :end_date, :rooms_attributes, :tracks_attributes, :dietary_choices_attributes,
                   :use_dietary_choices, :use_supporter_levels, :supporter_levels_attributes, :social_events_attributes,
-<<<<<<< HEAD
-                  :event_types_attributes, :registration_start_date, :registration_end_date, :logo, :questions_attributes, :question_ids, :answers_attributes, :answer_ids, :difficulty_levels_attributes, :use_difficulty_levels
-=======
-                  :event_types_attributes, :registration_start_date, :registration_end_date, :logo, :use_vpositions, :use_vdays, :vdays_attributes,
-                  :vpositions_attributes
->>>>>>> 64b2b8b3f8a62be1a4161d957c06a958debe89cc
+                  :event_types_attributes, :registration_start_date, :registration_end_date, :logo,
+		  :questions_attributes, :question_ids, :answers_attributes, :answer_ids,
+                  :difficulty_levels_attributes, :use_difficulty_levels,
+                  :use_vpositions, :use_vdays, :vdays_attributes, :vpositions_attributes
 
   has_paper_trail
 
@@ -40,12 +38,9 @@ class Conference < ActiveRecord::Base
   accepts_nested_attributes_for :supporter_levels, :allow_destroy => true
   accepts_nested_attributes_for :event_types, :allow_destroy => true
   accepts_nested_attributes_for :email_settings
-<<<<<<< HEAD
   accepts_nested_attributes_for :questions, :allow_destroy => true
-=======
   accepts_nested_attributes_for :vdays, :allow_destroy => true
   accepts_nested_attributes_for :vpositions, :allow_destroy => true
->>>>>>> 64b2b8b3f8a62be1a4161d957c06a958debe89cc
 
   has_attached_file :logo,
                     :styles => {:thumb => "100x100>", :large => "300x300>" }