upvotes are sort of working
upvote number
merging stuff
mergetooled