readme
manual merge