lesson in merge error
this is our merge error
Merge branch 'bugfix'

Conflicts:
	fix.txt