prevent revotes
fix merge conflict