New function
Merge remote-tracking branch 'origin/master'
Broken
Merge remote-tracking branch 'origin/master'

Conflicts:
	other_thing.php