diff --git a/gradle.properties b/gradle.properties
index f4a37d90df..f6a5f53a93 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -83,10 +83,14 @@ MOGO_TELEMATIC_VERSION=1.4.3.6
 ######## MogoAiCloudSDK Version ########
 # 自研地图
 <<<<<<< HEAD
+<<<<<<< HEAD
 MAP_SDK_VERSION=2.2.1.1
 =======
 MAP_SDK_VERSION=2.2.1
 >>>>>>> f0fcf57f0 (「Change」)
+=======
+MAP_SDK_VERSION=2.2.1.1
+>>>>>>> 1f51e79dd (「Change」)
 MAP_SDK_OPERATION_VERSION=1.0.13
 # websocket
 WEBSOCKET_VERSION=1.1.7