voting display updated
schema conflict resolved