Merge vote_edit.js