tiny change to migration sentence in main index
resolved conflict in index.rst