second commit with collision
Merge branch 'master' of https://github.com/ofedotoff/OMS

Conflicts:
	test.txt.txt