updated index
resolve merge conflict