NCIS: Jimmy Palmer and Gerald Jackson confusion?

I think Palmer replaced Gerald while he was recovering form his gunshot wound, and then he came back, but left again after Ari came back the second time so Palmer took over for good.