How do I stop swaddling??!!!

So my baby girl is almost 5 months and starting to show signs of rolling. We have been swaddling her with arms out for naps, but not her for bedtime. We tried tonight and omg it was horrible. She ended up sideways and wide awake. Idk what to do. It’s not the startle reflex anymore, she just won’t stay still without being swaddled up!