w
no message
Merge branch 'branch' into branch3

Conflicts:
	file.txt