add votes to answers
resolve merge conflict