# Conflicts: # src/Core/Abstractions/ICipherService.cs # src/Core/Abstractions/IStateService.cs # src/Core/Models/AppOptions.cs # src/Core/Resources/Localization/AppResources.resx # src/Core/Utilities/ServiceContainer.cs # src/iOS.Autofill/iOS.Autofill.csproj