edit manifest
merge
edit readme