More progress merging docs