Add summary section to "merge conflicts" episode

[alexdewar]

There currently isn't one. I must have forgotten about it when I split it out from the preceding episode.