branch commit
Merge branch 'fix-up'
another file
foo
this should blow up
Merge branch 'feature4'

Conflicts:
	index.html
ted
plonk
changed