diff --git a/HLT/ParticleNetAK8/V01/preprocess.json b/HLT/ParticleNetAK8/V01/preprocess.json
index 5b82d53..3864731 100644
--- a/HLT/ParticleNetAK8/V01/preprocess.json
+++ b/HLT/ParticleNetAK8/V01/preprocess.json
@@ -42,11 +42,7 @@
         "pad": 0
       }
     },
-<<<<<<< HEAD
     "min_length": 24,
-=======
-    "min_length": 16,
->>>>>>> 512f5defb78eda1dbd5d5a61a60810ba37175a81
     "max_length": 100
   },
   "pf_features": {
@@ -73,14 +69,7 @@
       "jet_pfcand_trackjet_dist",
       "jet_pfcand_trackjet_decayL",
       "jet_pfcand_npixhits",
-<<<<<<< HEAD
       "jet_pfcand_nstriphits"
-=======
-      "jet_pfcand_nstriphits",
-      "jet_pfcand_id",
-      "jet_pfcand_hcalfraction",
-      "jet_pfcand_calofraction"
->>>>>>> 512f5defb78eda1dbd5d5a61a60810ba37175a81
     ],
     "var_infos": {
       "jet_pfcand_pt_log": {
@@ -266,39 +255,9 @@
         "lower_bound": -5,
         "upper_bound": 5,
         "pad": 0
-<<<<<<< HEAD
       }
     },
     "min_length": 24,
-=======
-      },
-      "jet_pfcand_id": {
-        "median": 2,
-        "norm_factor": 0.2,
-        "replace_inf_value": 0,
-        "lower_bound": -5,
-        "upper_bound": 5,
-        "pad": 0
-      },
-      "jet_pfcand_hcalfraction": {
-        "median": 0,
-        "norm_factor": 1,
-        "replace_inf_value": 0,
-        "lower_bound": 0,
-        "upper_bound": 1,
-        "pad": 0
-      },
-      "jet_pfcand_calofraction": {
-        "median": 0,
-        "norm_factor": 1,
-        "replace_inf_value": 0,
-        "lower_bound": 0,
-        "upper_bound": 5,
-        "pad": 0
-      }
-    },
-    "min_length": 16,
->>>>>>> 512f5defb78eda1dbd5d5a61a60810ba37175a81
     "max_length": 100
   },
   "pf_mask": {
@@ -315,11 +274,7 @@
         "pad": 0
       }
     },
-<<<<<<< HEAD
     "min_length": 24,
-=======
-    "min_length": 16,
->>>>>>> 512f5defb78eda1dbd5d5a61a60810ba37175a81
     "max_length": 100
   },
   "sv_points": {