DesignDocument.md: resolve merge conflict