add contributors.txt, fix README.md conflicts