# Resolved Conflicts: # src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml # src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml # src/Umbraco.Web/Composing/Current.cs # src/Umbraco.Web/Editors/BackOfficeController.cs # src/Umbraco.Web/Editors/BackOfficeServerVariables.cs # src/Umbraco.Web/Editors/PreviewController.cs # src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs