Tomorrow is Yesterday - S1-E20
Other mistake: The Air Force police officer (played by Hal Lynch) was beamed up from inside the records room (after finding Kirk exiting the dark-room) but was returned outside the room... so he was physically transported INTO himself (as opposed to replacing the beamed-up future version at the exact moment and place he was removed as they did the pilot, Christopher).