Update index
Resolve merge conflicts