diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java
index c70f5eabfd..be86c4e7ad 100644
--- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java
+++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java
@@ -53,26 +53,13 @@ public class MogoModulesManager implements MogoModulesHandler{
     public static final String KEY_SORTED_CARD_MODULES = "sortedCards";
     private List< String > mSortedCards = new ArrayList<>();
 
-    private IMogoIntentManager mMogoIntentManager;
-
     public MogoModulesManager( MainActivity activity , IMogoServiceApis apis) {
         if ( activity == null ) {
             throw new NullPointerException( "activity can't be null." );
         }
         this.mActivity = activity;
-<<<<<<< HEAD
-        IMogoServiceApis apis = ( IMogoServiceApis ) ARouter.getInstance().build( MogoServicePaths.PATH_SERVICE_APIS ).navigation();
-        mMogoIntentManager = apis.getIntentManagerApi();
-
-        EventDispatchCenter.getInstance().registerReceiver(mMogoIntentManager);
-        CardIntroduceConfigs.init( getContext(), apis.getStatusManagerApi() );
-=======
-        mTrackManager = apis.getAnalyticsApi();
-        mMogoIntentManager = apis.getIntentManagerApi();
-
-        registerReceiver();
+        EventDispatchCenter.getInstance().registerReceiver(apis.getIntentManagerApi());
         CardIntroduceConfigs.init( getContext(), apis );
->>>>>>> feature/v1.0.4
     }
 
     private Context getContext() {