[namespace.udecl]/14 clarify wording for comparisons between templates and non-templates

[namespace.udecl]/14 "... member functions and member function templates in the derived class override and/or hide member functions and member function templates ..."

We recently ran into a bug where we had this code:

template <typename>
struct Result { };

struct Base {
  template <typename T>
  Result<T> f(int) const;

  virtual Result<int> f(int) const = 0;
};

struct Derived : Base {
  virtual Result<int> f(int) const final;
  using Base::f;
};

struct S { };

void f() {
    Derived d;
    d.f<S>(0);
}

And I found wording of [namespace.udecl]/14 to be insufficient in distinguishing that we need to compare member functions and member function templates respectively. @GabrielDosReis had to help guide me to the correct interpretation.

Can this be addressed editorially?

Start by reading [namespace.udecl]/14 and the example in this issue, focusing on the distinction between member functions and member function templates. Revise the wording so the two categories are compared respectively, then verify that the example's lookup and hiding behavior is unambiguous in the resulting text.