f3 1.1
m6.5 Merge branch 'feature3'

Conflicts:
	t1.txt
	t2.txt
	t3.txt