Fix readme conflict