change this to that
make fix important
Merge branch 'bug-fix'

Conflicts:
	fix.txt