insert index.php
insert index.php
Merge remote-tracking branch 'origin/master'
insert naros
insert naros
Update from best
Update from best1
naros
naros after
naros after
Merge remote-tracking branch 'origin/master'

Conflicts:
	test.php
error
commit
error
Merge remote-tracking branch 'origin/master'

Conflicts:
	test.php
commit j.best
hi
php
html
html