<P> In the Season 4 finale, "Angel of Death", it is made apparent that Tony and Jeanne's relationship was orchestrated by NCIS Director Jenny Shepard (Lauren Holly) in hopes of catching Jeanne's father, an arms dealer, though Tony had fallen in love while on assignment . Jeanne breaks it off following this revelation, and their storyline is ultimately given closure in the fifth season episode "Internal Affairs". </P> <P> Bellisario stepped down as executive producer in May 2007 after series star Mark Harmon threatened to walk due to alleged "overly long production days", and co-executive producer Charles Floyd Johnson and head writer Shane Brennan took over afterwards . </P> <P> Following the fatal shooting of Director Shepard in the fifth season finale, the NCIS team is disbanded by the new Director Vance: McGee is sent to cyber crimes, Ziva is returned to Israel, and Tony is deployed on an aircraft carrier . </P> <P> Season 6 focuses more on Ziva and Tony, but leaves their relationship undefined . Gibbs manages to have Ziva and McGee transferred back to the team in the premiere, but Tony is still acting as agent afloat on the USS Seahawk . In the following episode, Ziva accompanies Gibbs onto the Seahawk as part of a murder investigation and notices that Tony has pictures of her in a bikini pinned up in his room . After the investigation is closed, his deployment is ended prematurely and he is allowed to return to the team in the conclusion of the episode . </P>

What episode does ziva and tony get together