changes this to that
made this fix important
Merge branch 'bug-fix-1'

Conflicts:
	fix.txt