diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 48cbf31d58..33c9610c8f 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,10 +4,9 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="GRADLE" />
+        <option name="testRunner" value="PLATFORM" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="11" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
@@ -82,6 +81,7 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
+        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
index c32af63a2a..b234d12d36 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
@@ -7,6 +7,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.SystemClock;
 import android.text.TextUtils;
+import android.util.Log;
 import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
@@ -67,14 +68,11 @@ import com.mogo.module.extensions.utils.EntranceViewHolder;
 import com.mogo.module.extensions.utils.NoMapTopViewShaderHelper;
 import com.mogo.module.extensions.utils.TopViewAnimHelper;
 import com.mogo.module.extensions.utils.TopViewNoLinkageAnimHelper;
+import com.mogo.module.service.receiver.MogoReceiver;
 import com.mogo.module.share.manager.ServiceApisManager;
 import com.mogo.service.IMogoServiceApis;
-<<<<<<< HEAD
-import com.mogo.service.MogoServicePaths;
-=======
 import com.mogo.service.adas.IMogoAdasOCHCallback;
 import com.mogo.service.adas.entity.AdasOCHData;
->>>>>>> dev/dev_eagle_architecture_upgrade
 import com.mogo.service.analytics.IMogoAnalytics;
 import com.mogo.service.cloud.socket.IMogoOnMessageListener;
 import com.mogo.service.entrance.ButtonIndex;
@@ -132,15 +130,10 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
         IMogoAimlessModeListener,
         IMogoStatusChangedListener,
         IMogoIntentListener,
-<<<<<<< HEAD
 //        IMogoLocationListener,
-        IMogoCarLocationChangedListener2,
-        IMogoCheckListener {
-
-=======
+        IMogoCheckListener ,
         IMogoAdasOCHCallback,
         IMogoCarLocationChangedListener2 {
->>>>>>> dev/dev_eagle_architecture_upgrade
 
     private static final String TAG = "EntranceFragment";
 
@@ -393,21 +386,19 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
         // 根据本地配置设置自车图标
         MyLocationUtil.setMyLocationIconUrl(getContext());
 
-<<<<<<< HEAD
-        flSpeed = (FrameLayout) findViewById(R.id.fl_speed);
-        mouduleArc = (ArcView) findViewById(R.id.moudule_arc);
-        if (DebugConfig.isDebug()) {
-            mouduleArc.setLongClickable(true);
-            mouduleArc.setOnLongClickListener(v -> {
-                Log.d(TAG, "长按显示状态工具栏");
-                Intent intent = new Intent();
-                intent.putExtra("oper", 52);
-                MogoApisHandler.getInstance().getApis().getIntentManagerApi().invoke(MogoReceiver.ACTION_MOCK, intent);
-                return true;
-            });
-        }
-=======
->>>>>>> dev/dev_eagle_architecture_upgrade
+//        flSpeed = (FrameLayout) findViewById(R.id.fl_speed);
+//        mouduleArc = (ArcView) findViewById(R.id.moudule_arc);
+//        if (DebugConfig.isDebug()) {
+//            mouduleArc.setLongClickable(true);
+//            mouduleArc.setOnLongClickListener(v -> {
+//                Log.d(TAG, "长按显示状态工具栏");
+//                Intent intent = new Intent();
+//                intent.putExtra("oper", 52);
+//                MogoApisHandler.getInstance().getApis().getIntentManagerApi().invoke(MogoReceiver.ACTION_MOCK, intent);
+//                return true;
+//            });
+//        }
+
         clTrafficLight = (ConstraintLayout) findViewById(R.id.cl_traffic_light);
         tvYellow = (TextView) findViewById(R.id.tv_yellow);
         tvRed = (TextView) findViewById(R.id.tv_red);
@@ -1447,15 +1438,14 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
     }
 
     @Override
-<<<<<<< HEAD
-    public void updateMonitoringStatus(boolean hasError) {
-        Log.d(TAG, "updateCheckStatus");
-        if (hasError == true) {
-            tipImageView.setVisibility(View.VISIBLE);
-        } else {
-            tipImageView.setVisibility(View.INVISIBLE);
+    public void updateMonitoringStatus(boolean hasError){
+        Log.d(TAG,"updateCheckStatus");
+        if(hasError==true){
+        tipImageView.setVisibility(View.VISIBLE);
+        }else{
+        tipImageView.setVisibility(View.INVISIBLE);
+        }
         }
-=======
     public void onArriveAt(AdasOCHData data) {
 
     }
@@ -1463,6 +1453,5 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
     @Override
     public void onStateChanged(int state, String reason) {
         ctvAutopilotStatus.setChecked(state == IMogoAdasOCHCallback.STATUS_AUTOPILOT_RUNNING);
->>>>>>> dev/dev_eagle_architecture_upgrade
     }
 }
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/status/EnvStatusManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/status/EnvStatusManager.java
index 31aa0fa13b..2e60fc9d82 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/status/EnvStatusManager.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/status/EnvStatusManager.java
@@ -82,14 +82,10 @@ public class EnvStatusManager {
                 "网络状态",
                 "App版本",
                 "Map版本",
-<<<<<<< HEAD
-                "SN"
-=======
                 "SN",
                 "OBU状态",
                 "HV状态",
                 "RV状态"
->>>>>>> dev/dev_eagle_architecture_upgrade
         };
         StringBuilder stringBuilder = new StringBuilder();
         for (int i = 0; i < sStatusName.length; i++) {
@@ -109,8 +105,6 @@ public class EnvStatusManager {
                 }
             } else if(i == 10){
                 stringBuilder.append(MoGoAiCloudClientConfig.getInstance().getSn()).append("\n");
-<<<<<<< HEAD
-=======
             } else if (i == 11) {
                 boolean isObuConnect = SharedPrefsMgr.getInstance(mContext).getBoolean("OBU", false);
                 stringBuilder.append(isObuConnect == true ? "已连接" : "未连接").append("\n");
@@ -120,7 +114,6 @@ public class EnvStatusManager {
             } else if (i == 13) {
                 boolean isRv = SharedPrefsMgr.getInstance( mContext ).getBoolean("OBU_RV", false );
                 stringBuilder.append(isRv == true ? "已连接" : "未连接").append("\n");
->>>>>>> dev/dev_eagle_architecture_upgrade
             } else {
                 stringBuilder.append("true".equals(DebugConfig.getStatus(i, true)) ? "正常" : "异常").append("\n");
             }
diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java b/services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java
index dee1e57565..f821cf42d1 100644
--- a/services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java
+++ b/services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java
@@ -7,14 +7,9 @@ import com.mogo.service.adas.IMogoADASController;
 import com.mogo.service.analytics.IMogoAnalytics;
 import com.mogo.service.auth.IMogoAuthManager;
 import com.mogo.service.cardmanager.IMogoCardManager;
-<<<<<<< HEAD
 import com.mogo.service.check.ICheckProvider;
-import com.mogo.service.connection.IMogoSocketManager;
-import com.mogo.service.connection.IMogoWebSocketManager;
-=======
 import com.mogo.service.cloud.socket.IMogoSocketManager;
 import com.mogo.service.cloud.socket.IMogoWebSocketManager;
->>>>>>> dev/dev_eagle_architecture_upgrade
 import com.mogo.service.datamanager.IMogoDataManager;
 import com.mogo.service.entrance.IMogoEntranceButtonController;
 import com.mogo.service.eventpanel.IEventPanelProvider;
@@ -328,7 +323,6 @@ public interface IMogoServiceApis extends IProvider {
     IMogoSmallMapProvider getSmallMapProviderApi();
 
     /**
-<<<<<<< HEAD
      * 检测接口
      */
     ICheckProvider getCheckProvider();
@@ -336,10 +330,6 @@ public interface IMogoServiceApis extends IProvider {
     /*
      *V2X
      * */
-=======
-     * V2X
-     */
->>>>>>> dev/dev_eagle_architecture_upgrade
     IV2XProvider getV2XListenerManager();
 
     /**
diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java b/services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java
index aad5a4cf74..67ab95c352 100644
--- a/services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java
+++ b/services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java
@@ -370,18 +370,14 @@ public class MogoServicePaths {
     @Deprecated
     public static final String PATH_ADAS = "/adas/api";
 
-    /**
-     * 前方碰撞预警  未碰撞
-     */
-<<<<<<< HEAD
-    public static final String PATH_V2X_FRONT_CRASH_WARNING = "/front/crashwarning";
-
     /**
      * 车辆检测 模块
      */
     public static final String PATH_CHECK = "/check/api";
 
-=======
+    /**
+     * 前方碰撞预警  未碰撞
+     */
     @Keep
     @Deprecated
     public static final String PATH_V2X_FRONT_CRASH_WARNING = "/front/crashwarning";
@@ -399,5 +395,4 @@ public class MogoServicePaths {
     @Keep
     @Deprecated
     public static final String PATH_V2X_OBU_MOGO = "/obu_mogo/api";
->>>>>>> dev/dev_eagle_architecture_upgrade
 }
diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java b/services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java
index 8013916dc4..e278a39da8 100644
--- a/services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java
+++ b/services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java
@@ -11,14 +11,9 @@ import com.mogo.service.adas.IMogoADASController;
 import com.mogo.service.analytics.IMogoAnalytics;
 import com.mogo.service.auth.IMogoAuthManager;
 import com.mogo.service.cardmanager.IMogoCardManager;
-<<<<<<< HEAD
 import com.mogo.service.check.ICheckProvider;
-import com.mogo.service.connection.IMogoSocketManager;
-import com.mogo.service.connection.IMogoWebSocketManager;
-=======
 import com.mogo.service.cloud.socket.IMogoSocketManager;
 import com.mogo.service.cloud.socket.IMogoWebSocketManager;
->>>>>>> dev/dev_eagle_architecture_upgrade
 import com.mogo.service.datamanager.IMogoDataManager;
 import com.mogo.service.entrance.IMogoEntranceButtonController;
 import com.mogo.service.eventpanel.IEventPanelProvider;