tweak
(ignore my formatting of the official votesys)
conflict resolution