Merge in design page updates