diff --git a/frameworks/deviceauth_lite/source/hichain.c b/frameworks/deviceauth_lite/source/hichain.c
index 6d13098..261aca7 100644
--- a/frameworks/deviceauth_lite/source/hichain.c
+++ b/frameworks/deviceauth_lite/source/hichain.c
@@ -751,7 +751,7 @@ static void encap_inform_message(int32_t error_code, struct message *send)
 
 #if (defined(_CUT_EXCHANGE_) || defined(_CUT_EXCHANGE_SERVER_))
     if (error_code == HC_UNSUPPORT) {
-        send->msg_code=INVALID_MESSAGE;
+        send->msg_code = INVALID_MESSAGE;
         return;
     }
 #endif
diff --git a/frameworks/deviceauth_lite/source/key_agreement/sts_server.h b/frameworks/deviceauth_lite/source/key_agreement/sts_server.h
index fdde263..9a39183 100644
--- a/frameworks/deviceauth_lite/source/key_agreement/sts_server.h
+++ b/frameworks/deviceauth_lite/source/key_agreement/sts_server.h
@@ -92,7 +92,11 @@ struct sts_server {
     struct sts_end_response_data end_response_data;
 };
 #else
+<<<<<<< HEAD
 struct sts_server {
+=======
+struct sts_server{
+>>>>>>> 663a145bdb100a367cf19422faf1438a0625602d
     char rsv;
 };
 #endif