fix Issue 12242 - conflict error with public imports
[Refactoring] Add ScopeDsymbol::mergeOverloadSet
Merge pull request #3388 from 9rnsr/fix12242

Issue 12242 - conflict error with public imports