stripe
fixed merge confilcts, stripe