f1
f2
Merge branch 'f2' into development

Conflicts:
	foo.txt