voting is now working up and down
cleaning up merge conflicts