Bump active merchant and fix broken spec.