fixes conflicts with polls

app/models/poll/officer_assignment.rb

@@ -3,6 +3,7 @@ class Poll
     belongs_to :officer
     belongs_to :booth_assignment
     has_one :recount
+    has_many :voters
 
     validates :officer_id, presence: true
     validates :booth_assignment_id, presence: true

app/models/poll/voter.rb

@@ -4,6 +4,7 @@ class Poll
     belongs_to :user
     belongs_to :geozone
     belongs_to :booth_assignment
+    belongs_to :officer_assignment
 
     validates :poll_id, presence: true
     validates :user_id, presence: true