this is to get the movie as it was always intended to be:
1. when Obi-Wan and Luke are at the traffic stop with the troopers, a voiceover of what the trooper is thinking is heard: "yes these are the droids we are looking for, however I'm not paid high enough to fight a Master Jedi so I'll ID the confrontation"
2. Greedo realizes Han must have a blaster so he agrees to ID the fight, this time
3. C3PO offers to ID with Chewbacca but Chewbacca rips off his arms.
4. when Luke falls in the rancor pit, the rancor and Luke agree to not fight it out, but ID the match.
5. when the emperor is about to be thrown over the rail by Vader, the shouts "wait! I'm just an old man! can't we just ID it now? think all the lives you'll save if I order the fleet to stand down". Luke tells his father to stop. The emperor and Luke ID the fight. The rebels are given a number of systems to make a new republic while the imperial retains control of a number of systems (you can see this agrees well with the force awakens and no changes are needed there).

