added TedsBranch line to README.md
resolved conflict in README.md