diff --git a/LinphoneCoreImpl.java b/LinphoneCoreImpl.java
index f0f4dc15d..c67c18dc9 100644
--- a/LinphoneCoreImpl.java
+++ b/LinphoneCoreImpl.java
@@ -385,9 +385,6 @@ class LinphoneCoreImpl implements LinphoneCore {
 
 		return updateCall(nativePtr, ptrCall, ptrParams);
 	}
-<<<<<<< HEAD
-	
-	
 	public void setUploadBandwidth(int bw) {
 		setUploadBandwidth(nativePtr, bw);
 	}
@@ -406,14 +403,20 @@ class LinphoneCoreImpl implements LinphoneCore {
 		VideoSize vSize = new VideoSize();
 		vSize.setWidth(nativeSize[0]);
 		vSize.setHeight(nativeSize[1]);
-
 		return vSize;
-=======
+	}
 	public void setRing(String path) {
 		setRing(nativePtr, path);
 	}
 	public String getRing() {
 		return getRing(nativePtr);
->>>>>>> c95431295dc09c5558d38c6de49fa071c957d926
+	}
+	public boolean isNetworkReachable() {
+		// TODO Auto-generated method stub
+		return false;
+	}
+	public void setNetworkReachable(boolean isReachable) {
+		// TODO Auto-generated method stub
+		
 	}
 }