new merge readme

changes in branch and trunk