a.txt 11111
a.txt 2222222222
Merge branch 'dev'
test1
2 a.txt
Merge branch 'dev'

Conflicts:
	a.txt
shan qu x
zeng jia x
Merge branch 'de'

Conflicts:
	a.txt