add line form develop
ADd line two from feature1
 add line three
 add line four/five from feature1
line 5 from feature1
Conflicts:
	README
Merge branch 'features/feature1' into develop

Conflicts:
	README