Manual merge with Peppy