.
.
.
working voting on answers, next up writing tests for voting
answer voting with out tests"
conflicts resolved
 conflict resolving