Final fix for README.md merge issues