Fix merge errors

src/ImageSharp/Configuration.cs

@@ -227,7 +227,7 @@ public sealed class Configuration
             new TiffConfigurationModule(),
             new WebpConfigurationModule(),
             new QoiConfigurationModule(),
-            new HeifConfigurationModule());
+            new HeifConfigurationModule(),
             new IcoConfigurationModule(),
             new CurConfigurationModule());
 }

tests/ImageSharp.Tests/TestImages.cs

@@ -1138,6 +1138,7 @@ public static class TestImages
         public const string IrvineAvif = "Heif/Irvine_CA.avif";
 
         public const string XnConvert = "Heif/jpeg444_xnconvert.avif";
+    }
 
     public static class Ico
     {