started index file
fixed merge conflicts