verExa 1
verExa 2
Merge branch 'b' into d

Conflicts:
	TestGit/src/test.java