fix conflicts

spec/factories/roles.rb

@@ -1,18 +1,12 @@
 FactoryGirl.define do
   factory :role do
 
-    factory :participant_role do
-      name 'participant'
-    end
-
     factory :organizer_role do
       name 'organizer'
     end
 
-    factory :organizer_conference_1_role do
-      name 'organizer'
-      resource_type 'Conference'
-      resource_id 1
+    factory :cfp_role do
+      name 'cfp'
     end
   end
 end

spec/factories/users.rb

@@ -15,16 +15,12 @@ FactoryGirl.define do
       gravida.
     EOS
 
-    factory :participant do
-      after(:create) { |user| user.role_ids = create(:participant_role).id }
-    end
-
-    factory :organizer_conference_1 do
-      after(:create) { |user| user.role_ids = create(:organizer_conference_1_role).id }
-    end
-
     factory :admin do
       is_admin true
     end
+
+    factory :organizer do
+      after(:create) { |user| user.role_ids = create(:organizer_role).id }
+    end
   end
 end