small index changes
fixing merge conflicts