From e5a7075c0a3732f9c70908fa4a0a5cb16b3bebd8 Mon Sep 17 00:00:00 2001
From: alcexhim <alcexhim@gmail.com>
Date: Wed, 25 Jun 2014 09:04:34 -0400
Subject: [PATCH] Better method for merging elements with same/different ID

---
 .../ObjectModels/Markup/MarkupContainerElement.cs      | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/CSharp/Plugins/UniversalEditor.Essential/ObjectModels/Markup/MarkupContainerElement.cs b/CSharp/Plugins/UniversalEditor.Essential/ObjectModels/Markup/MarkupContainerElement.cs
index 7bee8511..fb309a0f 100644
--- a/CSharp/Plugins/UniversalEditor.Essential/ObjectModels/Markup/MarkupContainerElement.cs
+++ b/CSharp/Plugins/UniversalEditor.Essential/ObjectModels/Markup/MarkupContainerElement.cs
@@ -70,7 +70,15 @@ namespace UniversalEditor.ObjectModels.Markup
 
             foreach (MarkupElement el1 in tag.Elements)
             {
-                if (Elements.Contains(el1.FullName))
+				string id = null;
+				MarkupTagElement tag1 = (el1 as MarkupTagElement);
+				if (tag1 != null)
+				{
+					MarkupAttribute attID = tag1.Attributes["ID"];
+					if (attID != null) id = attID.Value;
+				}
+
+                if (Elements.Contains(el1.FullName, id))
                 {
                     Elements[el1.FullName].Combine(el1);
                 }