How it should have ended

The phantom menace

However, victory comes when the young Skywalker twins accidentally take control of two N-1 starfighters and go on to destroy the Federation's Droid Control Ship from the inside, killing Daultay Dofine and rendering the droid army useless. Meanwhile, Amidala and her force fight their way back into the royal palace and capture Nute Gunray. At the same time, in a Theed hangar bay, Darth Maul engages in combat with the two Jedi, using his double-bladed lightsaber. The battle moves from the hangar, across a series of catwalks, to the Theed Generator Complex. During the fight, Obi-Wan is separated from his master by being kicked off of a catwalk. He grabs the edge of another catwalk below and jumps back up to where Qui-Gon and Maul continue to fight. By this time, Qui-Gon and Maul have become separated by a force field in the entrance to the Generator Room. Obi-Wan catches up to them, but is divided from his master by four force fields. When the force fields deactivate, Jinn and Maul continue their battle while Kenobi remains divided from the battle by one force field when they all reactivate.

After a lengthy duel, Maul suddenly stuns Qui-Gon by hitting him on the chin with his lightsaber handle, then rams his blade straight into Qui-Gon's torso, mortally wounding him. Devastated and angered, Obi-Wan redoubles his assault upon Maul and chops the Sith's lightsaber in half, but Maul eventually overpowers and nearly kills Kenobi by Force pushing him over the edge of a seemingly bottomless reactor shaft. Obi-Wan saves himself from falling when he manages to grab onto a pipe protruding from the wall of the shaft. Maul kicks the Jedi's lightsaber into the pit and prepares to finish him off. After Obi-Wan calms himself, he uses the Force to leap out of the shaft and over Maul's head while summoning his fallen master's lightsaber to his hand. He lands behind the surprised Maul and cuts him in half; Maul's upper and lower body fall into the shaft.

Obi-Wan reaches Qui-Gon moments before he dies, as Qui-Gon instructs Obi-Wan to train Anakin and Katriy to become Jedi, reiterating that Anakin is the Chosen One. Obi-Wan gives his word that he will. Qui-Gon dies, leading to Obi-Wan to grieve for his deceased master. The newly elected Chancellor Palpatine arrives to congratulate Queen Amidala on her victory, as Nute Gunray is sent to stand trial for his crimes.
Later, in a room in the queen's palace, Yoda confers upon Obi-Wan the rank of Jedi Knight. Kenobi argues with Yoda about his promise to Qui-Gon regarding the twin's training. Yoda is convinced it is dangerous to train the boy, but tells Kenobi the Jedi Council has allowed Skywalker to become Kenobi's apprentice. Later that evening, in a temple in Theed, Qui-Gon's body is cremated, and Mace Windu and Yoda agree that the Sith are definitely to blame for the tragedy. As there are only ever two Sith at any given time (a Master and an apprentice), both Masters believe that one must still remain. The Naboo and Gungans organize a great victory celebration on the streets of Theed, in front on the palace. Obi-Wan Kenobi and Anakin Skywalker are present, the younger now wearing formal Jedi attire, and in his hair is a special braid: the mark of a Jedi Padawan. Palpatine meets Anakin personally assuring the kid that he will be watching his career with 'great interest'. The film ends with Queen Amidala presenting a gift of appreciation and friendship to Boss Nass and the Gungan people.