diff --git a/src/xmpp/jid.c b/src/xmpp/jid.c
index d3610da6..ccedcb3e 100644
--- a/src/xmpp/jid.c
+++ b/src/xmpp/jid.c
@@ -79,7 +79,6 @@ jid_create(const gchar* const str)
 gboolean
 jid_is_valid(const gchar* const str)
 {
-<<<<<<< HEAD
     if (str == NULL) {
         return FALSE;
     }