sss
hhh
Merge branch 'feature3'

Conflicts:
	file1.txt