doc updated after merge