merge with german changes