Need help transitioning out of swaddle

My daughter is 6.5 months old and is on the verge of rolling from back to front. She has been swaddled for the past few months due to her startle reflex waking her up. We would like to transition her out of the swaddle but not sure how to go about it. She already fights sleep at night and naps. When we try to keep her arms out she moves them around and cannot settle. Any suggestions would be so helpful. We would love to get more sleep and more naps out of her.