CLDR-18217 Fix two merge conflicts

-new HashSet<>(getRawExtraPaths()) is just slightly shorter code

-To get root LSR codes, use fullIterable, not necessary to skip any paths

Author: btangmu

tools/cldr-code/src/main/java/org/unicode/cldr/util/CLDRFile.java

@@ -3144,8 +3144,7 @@ public String getWinningPath(String path) {
      * @return
      */
     public Collection<String> getExtraPaths() {
-        Set<String> toAddTo = new HashSet<>();
-        toAddTo.addAll(getRawExtraPaths());
+        Set<String> toAddTo = new HashSet<>(getRawExtraPaths());
         for (String path : this.iterableWithoutExtras()) {
             toAddTo.remove(path);
         }

tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestCoverageLevel.java

@@ -1073,7 +1073,7 @@ public void testLSR() {
 
         // Get root LSR codes
 
-        for (String path : root.iterableDefault()) {
+        for (String path : root.fullIterable()) {
             if (!path.startsWith("//ldml/localeDisplayNames/")) {
                 continue;
             }