test conflit
resolve conflit
a
a
1
Merge branch 'test' of https://github.com/BUONJG/gittest into test

Conflicts:
	test2.php