all votes tests passing
merging