Separate handling for ballot questions :ballot_box_with_check:
Merge conflict resolution