fixed merge issue for votes (new function)
merge