Added conflict management for voter list