learngit readme.txt
learngit readme.txt
fix the conflicts