fixing merge issues in original proposal and product description of README.md