Fixup index merge conflicts