diff --git a/java/common/org/linphone/core/LinphoneCore.java b/java/common/org/linphone/core/LinphoneCore.java
index c1ca0d4d39d8760414c733863be78c5a12693dcc..422c0e5a0480e4cc9811bbf694db9c48d56375cb 100644
--- a/java/common/org/linphone/core/LinphoneCore.java
+++ b/java/common/org/linphone/core/LinphoneCore.java
@@ -22,6 +22,8 @@ package org.linphone.core;
 import java.util.Vector;
 
 
+
+
 	
 public interface LinphoneCore {
 	/*
@@ -176,6 +178,17 @@ public interface LinphoneCore {
 	 * @return level in db
 	 */
 	public float getPlaybackGain();
+	/**
+	 * set play level
+	 * @param level [0..100]
+	 */
+	public void setPlayLevel(int level);
+	/**
+	 * get playback level [0..100];
+	 * -1 if not cannot be determined
+	 * @return
+	 */
+	public int getPlayLevel();
 	/**
 	 *  Mutes or unmutes the local microphone.
 	 * @param isMuted
@@ -197,7 +210,6 @@ public interface LinphoneCore {
 	 */
 	public void clearCallLogs();
 	
-<<<<<<< master
 	
 	/***
 	 * get payload type  from mime type an clock rate
@@ -212,7 +224,6 @@ public interface LinphoneCore {
 	
 	public boolean isEchoCancellationEnabled();
 	
-=======
 	public void setSignalingTransport(Transport aTransport);
->>>>>>> local
+
 }