merge klarna with 1.5.5.1