edit README
merge README