diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java b/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java
index 02c7e541..f38dff3d 100644
--- a/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java
+++ b/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java
@@ -161,7 +161,7 @@ public class CommonAppContext extends MultiDexApplication  implements Applicatio
         //设置mqtt环境 false 测试环境 true 正式环境
 //      ExternalResConstants.INSTANCE.setIS_MQTT_RELEASE(false);
         //设置http环境 false 测试环境 true 正式环境
-        ExternalResConstants.INSTANCE.setIS_HTTP_RELEASE(true);
+        ExternalResConstants.INSTANCE.setIS_HTTP_RELEASE(false);
         currentEnvironment = ExternalResConstants.INSTANCE.HTTP_PATH();
 
         initialization();
diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/SettingActivity.java b/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/SettingActivity.java
index a459f5b5..3216e3e8 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/SettingActivity.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/SettingActivity.java
@@ -106,7 +106,6 @@ public class SettingActivity extends BaseMvpActivity<SettingPresenter, ActivityS
         if (MvpPre == null) {
             MvpPre = bindPresenter();
         }
-<<<<<<< HEAD
         int id = view.getId();
         // 通过 ID 获取资源名称
         String viewName = "";
@@ -118,17 +117,6 @@ public class SettingActivity extends BaseMvpActivity<SettingPresenter, ActivityS
         LogUtils.e("点击了~" + viewName);
 
         if (id == R.id.ll_youth) {
-=======
-        // 通过 ID 获取资源名称
-        String viewName = "";
-        try {
-            viewName = view.getContext().getResources().getResourceEntryName(view.getId());
-        } catch (Exception e) {
-            viewName = "未知View ID: " + view.getId();
-        }
-        LogUtils.e("roomUserInfoFragment","点击了" + viewName );
-        if (view.getId() == R.id.ll_youth) {
->>>>>>> branch_new_dev
 //            startActivity(new Intent(this, UnderageActivity.class));
             showYouthModelDialog();
         } else if (id == R.id.ll_notification) {
diff --git a/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomUserInfoFragment.java b/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomUserInfoFragment.java
index 09822870..0935cbe2 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomUserInfoFragment.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomUserInfoFragment.java
@@ -24,13 +24,9 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.alibaba.android.arouter.launcher.ARouter;
-<<<<<<< HEAD
 import com.blankj.utilcode.util.ActivityUtils;
 import com.blankj.utilcode.util.LogUtils;
 import com.xscm.modulemain.Application;
-=======
-import com.blankj.utilcode.util.LogUtils;
->>>>>>> branch_new_dev
 import com.xscm.modulemain.R;
 import com.xscm.modulemain.activity.room.contacts.RoomUserContacts;
 import com.xscm.modulemain.activity.user.activity.GiftWallActivity;