Indexing code Modifications
Conflicts resolved after parsing code merged