From f040d67f647aedd2d947c8cf279edfdee84c0e88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Enes=20Sad=C4=B1k=20=C3=96zbek?=
 <1809172+Trojaner@users.noreply.github.com>
Date: Thu, 26 Jun 2025 01:58:09 +0300
Subject: [PATCH] another merge conflict

---
 modules/sd_vae_taesd.py | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/modules/sd_vae_taesd.py b/modules/sd_vae_taesd.py
index 32191613b..3ef7e123d 100644
--- a/modules/sd_vae_taesd.py
+++ b/modules/sd_vae_taesd.py
@@ -52,29 +52,17 @@ def warn_once(msg, variant=None):
 def get_model(model_type = 'decoder', variant = None):
     global prev_cls, prev_type, prev_model # pylint: disable=global-statement
     from modules import shared
-<<<<<<< feature/chroma-support
-    cls = shared.sd_model_type
-    if cls in {'ldm', 'pixartalpha'}:
-        cls = 'sd'
-    elif cls in {'h1', 'lumina2', 'chroma'}:
-        cls = 'f1'
-    elif cls == 'pixartsigma':
-        cls = 'sdxl'
-    elif cls not in supported:
-        warn_once(f'cls={shared.sd_model.__class__.__name__} type={cls} unsuppported', variant=variant)
-=======
     model_cls = shared.sd_model_type
     if model_cls is None or model_cls == 'none':
         return None
     elif model_cls in {'ldm', 'pixartalpha'}:
         model_cls = 'sd'
-    elif model_cls in {'h1', 'lumina2'}:
+    elif model_cls in {'h1', 'lumina2', 'chroma'}:
         model_cls = 'f1'
     elif model_cls in {'pixartsigma', 'omnigen'}:
         model_cls = 'sdxl'
     elif model_cls not in supported:
         warn_once(f'cls={shared.sd_model.__class__.__name__} type={model_cls} unsuppported', variant=variant)
->>>>>>> dev
     variant = variant or shared.opts.taesd_variant
     folder = os.path.join(paths.models_path, "TAESD")
     os.makedirs(folder, exist_ok=True)