diff --git a/coreapi/callbacks.c b/coreapi/callbacks.c
index 550c98736c0a74c7f3d8e15f3f6131582e0763b5..c57016b97ec0b67c113417e1b3c84551ecb03f05 100644
--- a/coreapi/callbacks.c
+++ b/coreapi/callbacks.c
@@ -424,6 +424,10 @@ static void call_updating(SalOp *op){
 		}
 		/*accept the modification (sends a 200Ok)*/
 		sal_call_accept(op);
+<<<<<<< HEAD
+
+=======
+>>>>>>> 949b3cd84135d234abab27a023885ad977f715c9
 		if (prevstate!=LinphoneCallIdle){
 			linphone_call_set_state (call,prevstate,"Connected (streams running)");
 		}
diff --git a/coreapi/conference.c b/coreapi/conference.c
index a3ec516a3f56947691d41a1624b05fdfd82e4ca1..5b8a78d7e8a9aa8578657541fc740e029cc15613 100644
--- a/coreapi/conference.c
+++ b/coreapi/conference.c
@@ -61,6 +61,8 @@ void linphone_call_add_to_conf(LinphoneCall *call){
 	LinphoneCore *lc=call->core;
 	LinphoneConference *conf=&lc->conf_ctx;
 	MSAudioEndpoint *ep;
+	call->params.has_video = FALSE;
+	call->camera_active = FALSE;
 	ep=ms_audio_endpoint_get_from_stream(call->audiostream,TRUE);
 	ms_audio_conference_add_member(conf->conf,ep);
 	call->endpoint=ep;