edit otherbranch
master edit
Merge branch 'otherbranch'

Conflicts:
	newfile.php
???