diff --git a/gradle.properties b/gradle.properties
index c2175cc5d1..f4a37d90df 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -82,7 +82,11 @@ MOGO_LOCATION_VERSION=1.4.3.6
 MOGO_TELEMATIC_VERSION=1.4.3.6
 ######## MogoAiCloudSDK Version ########
 # 自研地图
+<<<<<<< HEAD
 MAP_SDK_VERSION=2.2.1.1
+=======
+MAP_SDK_VERSION=2.2.1
+>>>>>>> f0fcf57f0 (「Change」)
 MAP_SDK_OPERATION_VERSION=1.0.13
 # websocket
 WEBSOCKET_VERSION=1.1.7