Merge "Merge namespace aliases like we merge namespace names"