update github.txt and python.txt
update files
resolve conflicts