commit for conflict
Merge branch 'conflict1' into conflict0

Conflicts:
	TraceAndTestImpact_1.testsettings