4.php
4.php to make it conflict
Merge branch 'b1' of https://github.com/MinChoi/min1.0 into b1

Conflicts:
	4.php
5.php
Merge branch 'b1'

Conflicts:
	5.php