Fix config

Conflicts:
	config.yml