branch text
and simple
& simple
Merge branch 'feature1'

Conflicts:
	text.text
add dev_text
merge with no-ff