From d07ba12e730f791d95fd2e4cc82a276f4909b430 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 24 Jul 2014 14:50:06 -0700
Subject: [PATCH] Fixes merge

---
 .../ValueConverters/MacroContainerValueConverter.cs             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/PropertyEditors/ValueConverters/MacroContainerValueConverter.cs b/src/Umbraco.Web/PropertyEditors/ValueConverters/MacroContainerValueConverter.cs
index f08610350e..f5a4c2dc09 100644
--- a/src/Umbraco.Web/PropertyEditors/ValueConverters/MacroContainerValueConverter.cs
+++ b/src/Umbraco.Web/PropertyEditors/ValueConverters/MacroContainerValueConverter.cs
@@ -18,7 +18,7 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
     {
         public override bool IsConverter(PublishedPropertyType propertyType)
         {
-            return Guid.Parse(Constants.PropertyEditors.MacroContainer).Equals(propertyType.PropertyEditorGuid);
+            return propertyType.PropertyEditorAlias == Constants.PropertyEditors.MacroContainerAlias;
         }
 
         // NOT thread-safe over a request because it modifies the