upvotes working with ajax
fixed merge conflicts