diff --git a/.idea/misc.xml b/.idea/misc.xml
index 2dc54c489f..38ac68093c 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+<<<<<<< HEAD
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
+=======
+  <component name="ASMPluginConfiguration">
+    <asm skipDebug="false" skipFrames="false" skipCode="false" expandFrames="false" />
+    <groovy codeStyle="LEGACY" />
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+>>>>>>> qa
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 5b0620c0c7..8324550285 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,8 +1,8 @@
-import java.text.SimpleDateFormat
-
 apply plugin: 'com.android.application'
+apply plugin: 'com.alibaba.arouter'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
+import java.text.SimpleDateFormat
 
 android {
     compileSdkVersion rootProject.ext.android.compileSdkVersion
@@ -282,4 +282,4 @@ def getGitCommit() {
     gitCommit
 }
 
-apply plugin: 'arouterhook'
\ No newline at end of file
+apply plugin: 'arouterhook'
diff --git a/gradle.properties b/gradle.properties
index 966647ce14..6b66eabe5e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -83,6 +83,11 @@ MOGO_MODULE_AD_CARD_VERSION=1.0.1
 TANLULIB_VERSION=1.2.1.8-SNAPSHOT
 
 
+# Boost分包
+BOOST_MULTIDEX_VERSION=1.0.0
+# hook ARouter分包实现
+HOOKPLUGIN_VERSION=1.0.0
+
 # Boost分包
 BOOST_MULTIDEX_VERSION=1.0.0
 # hook ARouter分包实现
diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/BaseNaviInfoView.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/BaseNaviInfoView.java
index 85faab6b7a..192cdfe588 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/BaseNaviInfoView.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/BaseNaviInfoView.java
@@ -67,7 +67,7 @@ public abstract class BaseNaviInfoView {
 
     protected String getFormatSurplusTime( int seconds ) {
         if ( seconds > 60 * 60 ) {
-            mFormatSurplusDistanceUnit = "h";
+            mFormatSurplusTimeUnit = "h";
             return String.format( "%.1f", ( ( float ) seconds ) / ( 60 * 60 ) );
         }