diff --git a/strongarm.module b/strongarm.module
index f991462..069bda2 100644
--- a/strongarm.module
+++ b/strongarm.module
@@ -43,8 +43,13 @@ function strongarm_set_conf($reset = FALSE) {
     }
     cache_set('strongarm', $var_conf);
   }
-  global $conf;
-  $conf = array_merge($var_conf, $conf);
+  global $conf,$org_conf;
+
+  if (empty($org_conf)) {
+    $org_conf = $conf;
+  }
+
+  $conf = array_merge($var_conf, $org_conf);
 }
 
 /**