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