Add test.php in branch1
Add test.php in branch2
Merge branch 'branch2'

Conflicts:
	test.php