updated readme
merge fix