Plot: Diags and Amber put their misunderstanding behind them when they are forced to work together. Chloe Sims still isn't out of the woods when it comes to Mr Edgar