update readme
merge fix