From 757350ccb66d0917b8f7503354589981b16057cf Mon Sep 17 00:00:00 2001
From: emphasize <swen_g@t-online.de>
Date: Tue, 28 Feb 2023 21:06:31 +0100
Subject: [PATCH 1/2] change the config merge/load order

---
 ovos_config/config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ovos_config/config.py b/ovos_config/config.py
index 4084485..0bb81c3 100644
--- a/ovos_config/config.py
+++ b/ovos_config/config.py
@@ -174,7 +174,7 @@ def load_all_configs(system_constraints=None):
 
         configs = [Configuration.default, Configuration.system]
         if not skip_remote:
-            configs.append(Configuration.remote)
+            configs.insert(1, Configuration.remote)
         if not skip_user:
             # deprecation warning
             if isfile(OLD_USER_CONFIG):

From 24f73a34d1dd186260752cdb086dcd81f90dc842 Mon Sep 17 00:00:00 2001
From: emphasize <swen_g@t-online.de>
Date: Wed, 1 Mar 2023 17:12:40 +0100
Subject: [PATCH 2/2] fix merge test

---
 test/unittests/config_stack/default.yaml | 2 +-
 test/unittests/config_stack/remote.yaml  | 3 ++-
 test/unittests/config_stack/system.yaml  | 2 --
 test/unittests/config_stack/user.yaml    | 1 -
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/test/unittests/config_stack/default.yaml b/test/unittests/config_stack/default.yaml
index 0df0999..30d1ede 100644
--- a/test/unittests/config_stack/default.yaml
+++ b/test/unittests/config_stack/default.yaml
@@ -9,9 +9,9 @@ default_spec:
   from_usr: False
 test:
   default: True
+  remote: False
   system: False
   user: False
-  remote: False
 default_only: default
 system:
   protected_keys:
diff --git a/test/unittests/config_stack/remote.yaml b/test/unittests/config_stack/remote.yaml
index 7168bde..0db1071 100644
--- a/test/unittests/config_stack/remote.yaml
+++ b/test/unittests/config_stack/remote.yaml
@@ -4,8 +4,9 @@ system_only:
   from_rem: True
   from_usr: False
 test:
-  user: False
   remote: True
+  system: False
+  user: False
 default_spec:
   from_rem: True
 remote_only: "remote"
\ No newline at end of file
diff --git a/test/unittests/config_stack/system.yaml b/test/unittests/config_stack/system.yaml
index 5c01b70..a00617e 100644
--- a/test/unittests/config_stack/system.yaml
+++ b/test/unittests/config_stack/system.yaml
@@ -8,8 +8,6 @@ default_spec:
 test:
   system: True
   user: False
-  remote: False
-
 system:
   protected_keys:
     remote:
diff --git a/test/unittests/config_stack/user.yaml b/test/unittests/config_stack/user.yaml
index 6d2e346..27dc270 100644
--- a/test/unittests/config_stack/user.yaml
+++ b/test/unittests/config_stack/user.yaml
@@ -5,7 +5,6 @@ system_only:
   from_usr: True
 test:
   user: True
-  remote: False
 default_spec:
   from_usr: True
 user_only: True
\ No newline at end of file