Improve merging of docs on generation

Adds dedicated helper methods to perform sorting to clean up code, and
uses linear merging instead of iterating over both lists directly