fixed post-merge issues in index file