1
2
m1
m2
Merge branch 'f1'

Conflicts:
	1.txt