Indexer code
Indexer code conflicts resolution