Merge "Modified merging of duplicate emergency numbers"