code for create new election
resolved conflicts
resolve conflicts
resolving