add instructions to migrate readme
resolve merge conflict