Flailing arms

Has anyone got a baby with mega startle reflex!?  He has grown out if it a bit at14 weeks  but during daytime naps when I put him down his flailing arms wake him! For night it's magic Merlin sleepsuit but just wondering if he is going to grow out if flailing arms that prevent sleep?! Anyone else? Any advice? Thank you!