vote system
solved merge conflicts