That all changed in the penultimate episode of season seven, in which Christopher and Eddie's girlfriend Marisol (Edy Ganem) walk in on Eddie embracing another woman named Kim (Devin Kelley), who is actually a dead ringer for his late wife, Shannon (also played by Kelley), who died in season two.