Fixes vote conflict