working on upvotes
merge conflict