Adds index
Fixes conflicts