Fix merge conflicts as follows: * Unpack new zip archive into new destination. * Replace old combined schematic with new combined schematic, rename to remove colons from file name. * Add updated individual pages schematics.
