Fix readme file.
Resolve merge conflict in readme...