Fix before pull
merge conflict solved
HTML stabilno otdaetsya na 9600