Whoops! Who REALLY has the Death Star Plans at the end of Rogue One??

Rating: Null/10 (9 April 2017)

This is not a spoiler as the Movie has been out and available for over 3 months, and this is about an Editing Error that can be viewed on the DVD/Blueray or any steaming service currently showing the movie.
Yes, a "major" Editing Error at the end of Rogue One?
The Rebel with the Plans hands them through the broken airlock door to a Rebel on the other side, yelling "Hear take it! TAKE IT!" As Darth Vader advances towards him.
He is then killed by Darth Vader who impales him with his lightsaber while at the same time ramming his lightsaber through the broken door, which prompts that door to now open...
Then, in the VERY NEXT SCENE..
We see the Rebel who took the plans from the first one, and what is the first thing he does? With the Plans clearly visible in his hand, he runs into the now opened airlock, and then runs directly towards...
Darth Vader...
While still holding the plans in his hand.
He then falls to the floor, and cowers in the corner as Darth Vader advances on him.
Then in the next scene, we see the Rebels on Leia's ship then "launching" the ship and those Death Star Plans, previously in the hands of a Rebel cowering on the floor before Darth Vader...
Are now somehow and miraculously being handed over to Princess Leia as her ship flies away.
Can we all say whoops!
Who now really has the Death Star Plans?