Upravy a merge