new index file
fixed merge conflict