bb commits 1conflt
second conflict attempt.puppet
Merge remote branch 'origin/master' into testconflict

Conflicts:
	1conflict.txt