fix index from wierd merge conflict