updated voc
fixed merge