vyazadji2: changes for conflict 4