Conflicted strings
deleted string from smth.
Merge branch 'test'

Conflicts:
	smth.txt