Working on feature 1 c
Merge branch 'Feature1' into Development

Conflicts:
	test1.txt
Resolved: third line of feature 1 up over first line of feature 2