Create newFile.php
new code
Merge remote-tracking branch 'origin/master'
margin

Conflicts:
	test.php