index merge conflict