Another episode, this time with more conflict, as well as a clash with the past