modif other file || Spesivykh Maxim
conflict resolution
initiation of the movement watermark