diff --git a/quick/template/frameworks/runtime-src/proj.android/app/src/main/AndroidManifest.xml b/quick/template/frameworks/runtime-src/proj.android/app/src/main/AndroidManifest.xml
index 4b2663e3a5552771bd6af5ddf6c0398403226bb3..f84a4ba704cff1d1b003abd6646f595ed1383080 100755
--- a/quick/template/frameworks/runtime-src/proj.android/app/src/main/AndroidManifest.xml
+++ b/quick/template/frameworks/runtime-src/proj.android/app/src/main/AndroidManifest.xml
@@ -9,13 +9,8 @@
 
     <application android:label="@string/app_name"
                  android:usesCleartextTraffic="true"
-<<<<<<< HEAD
                  android:icon="@drawable/icon">
 
-=======
-                 android:icon="@drawable/icon">			  
-      
->>>>>>> 7472ba2329e868ec3f9a68678a0798391b773571
 		<activity android:name="org.cocos2dx.lua.AppActivity"
 			android:label="@string/app_name"
 			android:screenOrientation="__SCREEN_ORIENTATION_ANDROID__"