# Conflicts: # src/Umbraco.Infrastructure/Migrations/Upgrade/V_15_0_0/ConvertBlockEditorPropertiesBase.cs # src/Umbraco.Web.UI.Client
# Conflicts: # src/Umbraco.Infrastructure/Migrations/Upgrade/V_15_0_0/ConvertBlockEditorPropertiesBase.cs # src/Umbraco.Web.UI.Client