fix conlicts
INDEX FIX