Fix-readme-and-fix-merge