both commit changes test 1
Merge origin/master

Conflicts:
	thisismynewfile.php