add junk to Stein.md
Fix merge conflict