getIndices, baseoffset added, not compiled
conflict resolution
conflict resolution2
conflict resolution3
conflict resolution4