modify 2.txt
Merge remote-tracking branch 'origin/master'

Conflicts:
	2.txt
modify 2.txt