# Conflicts: # CHANGELOG.md # ICD.Common.Utils/Extensions/DictionaryExtensions.cs # ICD.Common.Utils/Properties/AssemblyInfo.cs