Add upvote and downvote system
Fix merge conflicts