line 1
line 2
Merge branch 'feature-a' into develop

Conflicts:
	TestGit
a
b