Merge conflicts in test:stratum2-hello:
	conflict.txt
Merge conflicts in test:stratum3-hello:
	conflict.txt