fixed merge conflict with index