Fix merge conflict resolution errors

Author: salcock

src/collector/collector_sync.c

@@ -1262,8 +1262,6 @@ static void remove_ip_intercept(collector_sync_t *sync, ipintercept_t *ipint) {
 
     if (ipint->vendmirrorid != OPENLI_VENDOR_MIRROR_NONE) {
         remove_vendormirror_id(sync, ipint);
-    } else if (!uuid_is_null(ipint->common.xid)) {
-        withdraw_xid(sync, ipint);
     }
     withdraw_xid(sync, ipint);
     publish_openli_msg(sync->zmq_pubsocks[ipint->common.seqtrackerid], expmsg);

src/intercept.c

@@ -94,7 +94,6 @@ int compare_xid_list(intercept_common_t *a, intercept_common_t *b) {
         }
     }
     return 0;
->>>>>>> develop
 }
 
 int update_modified_intercept_common(intercept_common_t *current,

src/provisioner/updateserver_jsoncreation.c

@@ -89,14 +89,6 @@ static void convert_commonintercept_to_json(json_object *jobj,
         encrypt_str = "none";
     }
 
-    if (!uuid_is_null(common->xid)) {
-        uuid_unparse(common->xid, uuid);
-        xid = json_object_new_string(uuid);
-    } else {
-        xid = NULL;
-    }
-
-
     xids = NULL;
     if (common->xid_count > 0) {
         size_t i;