version 3
Merge branch 'feature2'

Conflicts:
	config