upvote almost working
merge fix