You can probably just move both of them to the camp and do flashbacks as necessary. Gwen's back at the camp so you can just have Diana bump into Gwen if you want.