Волхов Михаил 2538

merge conflicts in files => doesn't compile