Index modified.
changes
new changes
Addressed merge conflict.