fixeы
resolved conflicts