Index Items fixed
Comflict fixed