fixed merge conflicts: NEW DATABASE STRUCT + UPDATED VOTE PAGE