created conflict
Merge remote-tracking branch 'origin/master' into NIBG-123

Conflicts:
	test.txt