fixed merge conflict for the index file