Fix readme typo and merge conflict