Conflicts: src/Umbraco.Web.UI.Client/src/less/modals.less src/Umbraco.Web/Mvc/AdminTokenAuthorizeAttribute.cs