first commit
test2  commit
test3   commit
test1 commit
Merge branches 'test1' and 'test3'

Conflicts:
	test.php