[DOC] third and four lines commit
Merge branch 'origin/master'

Conflicts:
	anotherdummyfile.txt