Conflicts: build/UmbracoVersion.txt src/SolutionInfo.cs src/Umbraco.Web.UI/Umbraco.Web.UI.csproj src/Umbraco.Web.UI/packages.config src/Umbraco.Web/Editors/BackOfficeController.cs src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlCacheFilePersister.cs src/Umbraco.Web/umbraco.presentation/content.cs src/umbraco.macroRenderings/app.config