add question votes
solve conflict