updated license and support info in README.md
fix merge conflict in README.md