vyazadji: changes for conflict 4
vyazadji2: resolv confilct 4