edit readme
merge