change readme
clean up merge conflict