resolved index merge conflict