Short roll pin 1
Now drive the short roll pin in. Again, go slowly and carefully.
Use a drill bit or drift in the end of the shift shaft, to prevent going way too far with it.
I would not recommend using the guide pin. If you go too far with the roll pin, it will jam the guide pin, and you'd probably scar it pulling it out of the jam.