Fixed another bug that was causing revisions to merge incorrectly.