Index update for merge
Merging
Finish fixing merge conflicts.