QFQ
Merge branch 'WWW'

Conflicts:
	file1.txt