Fix conflict with TSWvote