-fix conflict

2 files changed, 3 insertions, 3 deletions

diff --git a/src/conversation/conversation_api.c b/src/conversation/conversation_api.c
index 1984abdd6..2ede33586 100644
--- a/src/conversation/conversation_api.c
+++ b/src/conversation/conversation_api.c
@@ -300,7 +300,7 @@ find_caller (struct GNUNET_CONVERSATION_Phone *phone,
  * We received a `struct ClientPhoneHangupMessage`.
  *
  * @param cls the `struct GNUNET_CONVERSATION_Phone *`
- * @param msg the message
+ * @param hang the message
  */
 static void
 handle_phone_hangup (void *cls,
diff --git a/src/conversation/conversation_api_call.c b/src/conversation/conversation_api_call.c
index 2be7886fa..909b603ac 100644
--- a/src/conversation/conversation_api_call.c
+++ b/src/conversation/conversation_api_call.c
@@ -375,7 +375,7 @@ handle_call_hangup (void *cls,
  * We received a `struct ClientAudioMessage`, check it is well-formed.
  *
  * @param cls the `struct GNUNET_CONVERSATION_Call`
- * @param msg the message
+ * @param am the message
  * @return #GNUNET_OK (always well-formed)
  */
 static int
@@ -393,7 +393,7 @@ check_call_audio (void *cls,
  * We received a `struct ClientAudioMessage`
  *
  * @param cls the `struct GNUNET_CONVERSATION_Call`
- * @param msg the message
+ * @param am the message
  */
 static void
 handle_call_audio (void *cls,