changed vote comment permission and delete/edit
fix conflicts