diff --git a/base/changes.txt b/base/changes.txt
index 2005de230..59966cb88 100644
--- a/base/changes.txt
+++ b/base/changes.txt
@@ -127,7 +127,6 @@ are not part of the distribution.
 
 	* latexrelease.dtx, ltexpl.dtx, ltcmd.dtx:
 	Move most make-harmless redefinitions right after ltexpl.dtx.
->>>>>>> develop
 
 2022-02-21  Joseph Wright  <Joseph.Wright@latex-project.org>
 
diff --git a/base/ltfiles.dtx b/base/ltfiles.dtx
index a2369d17d..d99dfdcd4 100644
--- a/base/ltfiles.dtx
+++ b/base/ltfiles.dtx
@@ -1651,6 +1651,11 @@
           \ifx\filename@ext\relax tex\else\filename@ext\fi}%
        \expandafter\let\expandafter\reserved@b
                               \csname ver@\reserved@a\endcsname
+%    \end{macrocode}
+%    Packages that \cs{relax} their \cs{ver@...} string to allow for
+%    multiple loading (e.g., \pkg{fontenc}) can use \cs{ver@@...} to
+%    store the version information instead.
+%    \begin{macrocode}
        \ifx\reserved@b\relax
          \expandafter\let\expandafter\reserved@b
                          \csname ver@@\reserved@a\endcsname