AND simple
read
&simple
Merge branch 'feature1'

Conflicts:
	README.md
conflict fixed