fixed merge conflicts in index