# Conflicts: # src/Umbraco.Infrastructure/Runtime/SqlMainDomLock.cs # src/Umbraco.PublishedCache.NuCache/PublishedSnapshotService.cs # src/Umbraco.Web.UI.Client/src/views/users/user.controller.js # src/Umbraco.Web/Models/Trees/MenuItemList.cs # src/Umbraco.Web/Runtime/WebInitialComposer.cs # src/Umbraco.Web/Trees/RelationTypeTreeController.cs # src/Umbraco.Web/UmbracoApplication.cs