# Conflicts: # src/Umbraco.Core/Models/PropertyType.cs # src/Umbraco.Examine.Lucene/BackOfficeExamineSearcher.cs # src/Umbraco.Infrastructure/Models/Mapping/EntityMapDefinition.cs # src/Umbraco.Tests/Models/PropertyTypeTests.cs