fix upvote place
Merge remote-tracking branch 'origin/master'