WIP: Allow index entries to be merged