Fixed merge conflicts in ballot controller