fixed vbo
fixed merge conflicts