test:merge:popis_zmen