fixes some merge issues

src/Umbraco.Core/Persistence/Factories/MemberTypeReadOnlyFactory.cs

@@ -91,7 +91,7 @@ namespace Umbraco.Core.Persistence.Factories
 
                     var tempGroupDto = groupDto;
 
-                    var propertyType = new PropertyType(typeDto.ControlId, 
+                    var propertyType = new PropertyType(typeDto.PropertyEditorAlias, 
                         //ensures that any built-in membership properties have their correct dbtype assigned no matter
                         //what the underlying data type is
                         MemberTypeRepository.GetDbTypeForProperty(typeDto.Alias, typeDto.DbType.EnumParse<DataTypeDatabaseType>(true)))

src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericProperty.ascx.cs

@@ -268,7 +268,6 @@ namespace umbraco.controls.GenericProperties
         {
 			Delete(this,new EventArgs());
         }
-		#endregion
 
 	}
 }