From a0944496b21b5a77f10df6ac7a07f9c23b90fffb Mon Sep 17 00:00:00 2001
From: Dickson Mwendia <64727760+Dickson-Mwendia@users.noreply.github.com>
Date: Fri, 15 Aug 2025 17:10:11 +0300
Subject: [PATCH] resolve merge conflicts (#365)

---
 dsc/docs-conceptual/dsc-1.1/pull-server/pullServer.md | 1 +
 dsc/docs-conceptual/dsc-1.1/pull-server/secureMOF.md  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/dsc/docs-conceptual/dsc-1.1/pull-server/pullServer.md b/dsc/docs-conceptual/dsc-1.1/pull-server/pullServer.md
index f29404b..2552f96 100644
--- a/dsc/docs-conceptual/dsc-1.1/pull-server/pullServer.md
+++ b/dsc/docs-conceptual/dsc-1.1/pull-server/pullServer.md
@@ -3,6 +3,7 @@ ms.date: 05/08/2025
 keywords:  dsc,powershell,configuration,setup
 title:  DSC Pull Service
 description: Local Configuration Manager (LCM) can be centrally managed by a Pull Service solution. When using this approach, the node that's being managed is registered with a service and assigned a configuration in LCM settings.
+ms.custom: sfi-ropc-nochange
 ---
 
 # Desired State Configuration Pull Service
diff --git a/dsc/docs-conceptual/dsc-1.1/pull-server/secureMOF.md b/dsc/docs-conceptual/dsc-1.1/pull-server/secureMOF.md
index 3274226..f8e653c 100644
--- a/dsc/docs-conceptual/dsc-1.1/pull-server/secureMOF.md
+++ b/dsc/docs-conceptual/dsc-1.1/pull-server/secureMOF.md
@@ -2,6 +2,7 @@
 ms.date: 06/07/2021
 title:  Securing the MOF File
 description: This article describes how to ensure the target node has encrypted the MOF file.
+ms.custom: sfi-image-nochange
 ---
 # Securing the MOF File