ia
2
Update 1.txt
add 1
Merge branch 'test'

Conflicts:
	1.txt
modify the 2.txt