diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7eb49ab52..3addcdbb3 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.linphone"
-      android:versionCode="1103" android:versionName="1.1.3"  android:installLocation="auto"> 
+      android:versionCode="1104" android:versionName="1.1.4"  android:installLocation="auto"> 
     <uses-sdk android:minSdkVersion="3" />
     
     
@@ -143,6 +143,9 @@
 <uses-permission android:name="android.permission.VIBRATE"></uses-permission>
 <uses-permission android:name="android.permission.CAMERA" />
 
+<<<<<<< HEAD
 
+=======
+>>>>>>> e7697429c4475fb5f6ddfb800d5bbce0d4c20865
 <supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:anyDensity="true"/>
 </manifest>