Fixing readme merge issues.