1
1
1
1
1
3
33
1
Merge remote-tracking branch 'remotes/origin/three'

Conflicts:
	three.txt
Merge branch 'two'

Conflicts:
	demo.txt
2