Try to fix merging again.
Fix readme.