merge autocreated patch-1 and patch-2 to "German"