# Conflicts: # src/Umbraco.Infrastructure/Security/MemberUserStore.cs # src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Controllers/MemberControllerUnitTests.cs # src/Umbraco.Web.BackOffice/Controllers/MemberController.cs
# Conflicts: # src/Umbraco.Infrastructure/Security/MemberUserStore.cs # src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Controllers/MemberControllerUnitTests.cs # src/Umbraco.Web.BackOffice/Controllers/MemberController.cs