1
2
3
Merge branch 'branch1'

Conflicts:
	1.php