echo ccc/333 in 3.txt
echo 2 in 2.txt
Merge branch 'master' of github.com:andycnzh/TestGit

Conflicts:
	2.txt