diff --git a/experiments/boston/stage1/params.json b/experiments/boston/stage1/params.json
index ad9a695df71e3bf329b4d7b30094329daf6c6b4f..6a5a1e9a05d8f081af6abe38fa0aadfff1e736b8 100644
--- a/experiments/boston/stage1/params.json
+++ b/experiments/boston/stage1/params.json
@@ -1,6 +1,5 @@
 {
     "scorer": "neg_mean_squared_error",
-<<<<<<< HEAD
     "best_score_train": -11.238253315624897,
     "best_score_test": -7.312532120669678,
     "best_parameters": {
@@ -10,15 +9,4 @@
         "n_estimators": 1000
     },
     "random_seed": 289
-=======
-    "best_score_train": -12.900217003727361,
-    "best_score_test": -12.682938620298733,
-    "best_parameters": {
-        "max_depth": 18,
-        "max_features": "sqrt",
-        "min_samples_leaf": 1,
-        "n_estimators": 1000
-    },
-    "random_seed": 883
->>>>>>> a0f7c96f51b3e1575f6db1b704579b0cf1042c42
 }
\ No newline at end of file