конфликт
someshit
Merge remote-tracking branch 'origin' into bad

Conflicts:
	file.xml
Merge branch 'bad'