readme again, struggling with git merge...