Conflicts: build/UmbracoVersion.txt src/SolutionInfo.cs src/Umbraco.Core/packages.config src/Umbraco.Web.UI.Client/src/views/common/dialogs/user.controller.js src/Umbraco.Web.UI/packages.config src/Umbraco.Web/packages.config
Conflicts: build/UmbracoVersion.txt src/SolutionInfo.cs src/Umbraco.Core/packages.config src/Umbraco.Web.UI.Client/src/views/common/dialogs/user.controller.js src/Umbraco.Web.UI/packages.config src/Umbraco.Web/packages.config