# Conflicts: # src/SolutionInfo.cs # src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentEventsTests.cs # src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceTests.cs # src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/RedirectUrlServiceTests.cs # src/Umbraco.Tests/Services/EntityServiceTests.cs