merge conflicts
votes now have image_url column
fixed merge conflict