# Conflicts: # src/Umbraco.Core/Constants-Security.cs # src/Umbraco.Core/Security/BackOfficeUserStore.cs # src/Umbraco.Core/Services/ContentService.cs # src/Umbraco.Core/Services/UserService.cs # src/Umbraco.Tests/App.config # src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs