[CHANGELOG] Add entry for merging settings that have multiple entries in common
[CHANGELOG] Add entry for merging settings that have multiple entries in common

vincentisambart/Xcodeproj,CocoaPods/Xcodeproj