diff --git a/framework/res/xml/phonegap.xml b/framework/res/xml/phonegap.xml
index af8db2d7..97f31ea1 100644
--- a/framework/res/xml/phonegap.xml
+++ b/framework/res/xml/phonegap.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <phonegap>
     <access origin="http://127.0.0.1*"/>
-<<<<<<< HEAD
-=======
     <log level="DEBUG"/>
->>>>>>> 7ee04ebf313c7403cf623a1f9c00b6b5e7cc9f0b
 </phonegap>