# Conflicts: # src/Umbraco.Core/Models/Mapping/MemberTabsAndPropertiesMapper.cs # src/Umbraco.Core/Models/Member.cs # src/Umbraco.Core/Models/Membership/User.cs # src/Umbraco.Core/Services/MemberService.cs # src/Umbraco.Infrastructure/Security/BackOfficeUserStore.cs # src/Umbraco.Infrastructure/Security/MemberUserStore.cs