Fixed merge conflicts in index