the new diff algorithm had a bug that caused it to crash when clients only had parts of the conversation; I replaced it with the old merge algorithm