conf1
fixed conf on master
Merge branch 'bugfix'

Conflicts:
	fix.txt