fix conflict

libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java

@@ -401,4 +401,12 @@ public class MogoMapUIController implements IMogoMapUIController {
             mDelegate.clearRoadCacheById(id);
         }
     }
+
+    @Override
+    public void setAdasRecognizedResult(String result) {
+        initDelegate();
+        if (mDelegate != null) {
+            mDelegate.setAdasRecognizedResult(result);
+        }
+    }
 }