Merge plain & includes diagrams.