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