fix for unique secondary index bug (not enforcing)
resolve merge conflicts, include schemaVersion