test the push branch
Add new file trash.php and trash_2.php , then modify the trash.php
Modify the trash.php
Merge branch 'newossf' into ossf

Conflicts:
	world.php
Touch new file tag the naster branch
Under ststiion of the oter branch that name ossf modify
add coment for merge branch newossf into ossf
At the ossf branch and one modify ,add the new file on master
After the master2 of master branch, in world add comment
After newossf merge into ossf, and modify branch.php
Add the master3 in modify of newossf after
Merge branch 'ossf' into newossf
Merge branch 'newossf'