diff --git a/keycmd/__init__.py b/keycmd/__init__.py
index 3d18726..906d362 100644
--- a/keycmd/__init__.py
+++ b/keycmd/__init__.py
@@ -1 +1 @@
-__version__ = "0.5.0"
+__version__ = "0.6.0"
diff --git a/keycmd/conf.py b/keycmd/conf.py
index 9426f4a..09a1712 100644
--- a/keycmd/conf.py
+++ b/keycmd/conf.py
@@ -68,7 +68,7 @@ def merge_conf(a, b):
     a = a.copy()
     for key, value in b.items():
         if isinstance(value, dict):
-            old_value = a.setdefault(key, {})
+            old_value = a.get(key, {})
             a[key] = merge_conf(old_value, value)
         else:
             a[key] = value
@@ -94,6 +94,9 @@ def load_conf():
     # .keycmd
     local_keycmds = find_file(".keycmd", first_only=False)
     for local_keycmd in local_keycmds:
+        if local_keycmd == user_keyconf:
+            vlog(f"skipping config file {local_keycmd} (already loaded)")
+            continue
         vlog(f"loading config file {local_keycmd}")
         conf = merge_conf(conf, load_toml(local_keycmd))
 
diff --git a/pyproject.toml b/pyproject.toml
index a57ede3..c6c759f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "keycmd"
-version = "0.5.0"
+version = "0.6.0"
 description = ""
 authors = ["Korijn van Golen <korijn.vangolen@zimmerbiomet.com>"]
 license = "MIT"