add README.md
seems to work
fix bad merge