# Conflicts: # src/Umbraco.Infrastructure/PropertyEditors/DataValueReferenceFactoryCollection.cs # src/Umbraco.Web/Models/Mapping/ContentMapDefinition.cs # src/Umbraco.Web/PropertyEditors/ValueConverters/MarkdownEditorValueConverter.cs