The way we did this on Stack was that the longer edit overwrote shorter edits. Survival of the fittest.