restore & conflict fix 2

Author: v-tappelgate

support/windows-server/installing-updates-features-roles/known-issue-rollback.md

@@ -33,6 +33,7 @@ KIR came together as a functionally complete system beginning in Windows 10, ver
 
 ## How KIR works at the code level
 
+<<<<<<< Updated upstream
 <<<<<<< Updated upstream
 When Windows updates are released, changes are implemented with runtime feature flags. The KIR infrastructure evaluates your device policies, dictated via group policies and service-delivered metadata.
 
@@ -48,6 +49,8 @@ To know if your regression issue can be mitigated using KIR, refer [Ways for Ent
 
 Windows devices belong to two different categories for KIR activation. Each category has its own process for activating KIR:
 =======
+=======
+>>>>>>> Stashed changes
 Changes that Windows updates implement have built-in runtime feature flags. At runtime, the KIR infrastructure uses the policies on the device (determined by Group Policy settings and service-delivered metadata) to determine whether to run the new code or the previous code. This approach means that if the policies or metadata indicate that there's an issue in a specific change, that change reverts to the older code behavior.
 
 ## Scenarios that KIR supports
@@ -62,6 +65,9 @@ To find out if KIR can mitigate your regression issue, see [Ways for enterprises
 ## How KIR activates
 
 For the purpose of KIR activation, Windows devices belong to two different categories. Each category has its own process for activating KIR.
+<<<<<<< Updated upstream
+>>>>>>> Stashed changes
+=======
 >>>>>>> Stashed changes
 
 - **Enterprise-managed devices:** Enterprise-managed devices are [update-managed Windows devices](/windows/deployment/update/update-managed-unmanaged-devices#what-are-update-managed-windows-devices). Microsoft provides a Group Policy (GP) template to the organization's IT administrator to activate KIR.