Update merging docs