solve conflict in Indexer