fixed merge conflict after voting thing