From ca6efa73b1bfa5fea2c84b9a46276f3006d8004d Mon Sep 17 00:00:00 2001
From: David Leigh <to.david.leigh@gmail.com>
Date: Wed, 19 Jul 2023 06:25:24 +1000
Subject: [PATCH] + (CRM) Fixed the Person Merge to remove Mailing and Mapped
 flags from previous addresses. (Fixes #5503)

---
 RockWeb/Blocks/Crm/PersonMerge.ascx.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/RockWeb/Blocks/Crm/PersonMerge.ascx.cs b/RockWeb/Blocks/Crm/PersonMerge.ascx.cs
index 30047d185db..6dd5642592b 100644
--- a/RockWeb/Blocks/Crm/PersonMerge.ascx.cs
+++ b/RockWeb/Blocks/Crm/PersonMerge.ascx.cs
@@ -1019,6 +1019,9 @@ private void MergeAddresses( RockContext rockContext, Group primaryFamily )
                                     currentTargetFamilyLocation.GroupLocationTypeValue = null;
                                     currentTargetFamilyLocation.GroupLocationTypeValueId = prevLocType.Id;
 
+                                    currentTargetFamilyLocation.IsMailingLocation = false;
+                                    currentTargetFamilyLocation.IsMappedLocation = false;
+
                                     newTargetFamilyLocation = new GroupLocation();
                                 }
                                 else