added slap, fixed merge