Test for conflict
Merge remote-tracking branch 'origin/master'

Conflicts:
	NOTES.txt