diff --git a/unit_test/test/configure_test.cpp b/unit_test/test/configure_test.cpp
index 7220325..029a3af 100644
--- a/unit_test/test/configure_test.cpp
+++ b/unit_test/test/configure_test.cpp
@@ -21,6 +21,18 @@ TEST(config_file_test, load_ztpConfig)
 
     ASSERT_STREQ(pZtpCfg->svr_cfg.server_url, "cmhi.ztp.com");
     ASSERT_EQ(10082, pZtpCfg->svr_cfg.port);
+<<<<<<< HEAD
+=======
+}
+
+TEST(config_file_test, load_devConfig)
+{
+    int ret = init_configure("../../ztp.conf");
+    ASSERT_EQ(ERR_OK, ret);
+
+    ret = load_dev_config("ace08484843");
+    ASSERT_EQ(ERR_OK, ret);
+>>>>>>> ad92219248b9550b28ffe8c757d237cc61065513
 
     PDEVICE_CONFIG pDevCfg = get_device_configure();