Merge pull request #3395 from 9rnsr/rev_imports

Revert "Merge pull request #2256 from 9rnsr/fix_imports"
fix Issue 12242 - conflict error with public imports
[Refactoring] ScopeDsymbol::mergeOverloadSet