# Conflicts: # build/azure-pipelines.yml # src/Umbraco.Core/Configuration/Models/SecuritySettings.cs # version.json