diff --git a/ci4/app/Config/Kint.php b/ci4/app/Config/Kint.php
index 0fa50c8e..28a4cb40 100755
--- a/ci4/app/Config/Kint.php
+++ b/ci4/app/Config/Kint.php
@@ -43,7 +43,10 @@ class Kint extends BaseConfig
     public string $richTheme = 'aante-light.css';
     public bool $richFolder  = false;
     //public int $richSort     = AbstractRenderer::SORT_FULL;
+<<<<<<< HEAD
     public int $richSort     = 0;
+=======
+>>>>>>> main
 
     /**
      * @var array<string, class-string<ValuePluginInterface>>|null