Index update
Fixing merge errors