test:merge_manu:popis_zmen