Fixed the Bug

using wrong attribPointer
copying wrong buffer
Merge conflict resolved