diff --git a/summit/multiview_platform/monoview_classifiers/adaboost_graalpy.py b/summit/multiview_platform/monoview_classifiers/adaboost_graalpy.py
index 3b3e11583e3b8994490e027eba7ec952d17f8dd2..bca4883e1fec7627a030f1cf3c2a23ffb8c11e69 100644
--- a/summit/multiview_platform/monoview_classifiers/adaboost_graalpy.py
+++ b/summit/multiview_platform/monoview_classifiers/adaboost_graalpy.py
@@ -11,10 +11,7 @@ from ..monoview.monoview_utils import CustomRandint, \
     BaseMonoviewClassifier, change_label_to_minus, change_label_to_zero
 
 classifier_class_name = "AdaboostGraalpy"
-<<<<<<< HEAD
-=======
 proto=True
->>>>>>> 258ada8c7e5025f984b03343596557abe8d3f5a4
 
 class AdaBoostGP(BaseEstimator, ClassifierMixin, BaseBoost):
     """Scikit-Learn compatible AdaBoost classifier. Original code by Pascal Germain, adapted by Jean-Francis Roy.
diff --git a/summit/multiview_platform/monoview_classifiers/adaboost_pregen.py b/summit/multiview_platform/monoview_classifiers/adaboost_pregen.py
index 900769ceacbf99a56406756f9a46a64437304bd8..5b32fed3b440d7d95668a7b8bf63c9dafb0e3513 100644
--- a/summit/multiview_platform/monoview_classifiers/adaboost_pregen.py
+++ b/summit/multiview_platform/monoview_classifiers/adaboost_pregen.py
@@ -16,11 +16,7 @@ __status__ = "Prototype"  # Production, Development, Prototype
 
 
 classifier_class_name = "AdaboostPregen"
-<<<<<<< HEAD
-
-=======
 proto=True
->>>>>>> 258ada8c7e5025f984b03343596557abe8d3f5a4
 
 class AdaboostPregen(AdaBoostClassifier, BaseMonoviewClassifier,
                      PregenClassifier):
diff --git a/summit/multiview_platform/monoview_classifiers/additions/CBBoostUtils.py b/summit/multiview_platform/monoview_classifiers/additions/CBBoostUtils.py
index 70be1480e063da82123cea3183078a7eb85bcd5a..5b700216c63a79f2331f380917c561e503f2fe57 100644
--- a/summit/multiview_platform/monoview_classifiers/additions/CBBoostUtils.py
+++ b/summit/multiview_platform/monoview_classifiers/additions/CBBoostUtils.py
@@ -316,19 +316,11 @@ class CBBoostClassifier(BaseEstimator, ClassifierMixin, BaseBoost):
 
     def init_hypotheses(self, X, y):
         """Inintialization for the hyptotheses used to build the boosted vote"""
-<<<<<<< HEAD
-        if self.estimators_generator is "Stumps":
-            self.estimators_generator = StumpsClassifiersGenerator(
-                n_stumps_per_attribute=self.n_stumps,
-                self_complemented=self.self_complemented)
-        if self.estimators_generator is "Trees":
-=======
         if self.estimators_generator == "Stumps":
             self.estimators_generator = StumpsClassifiersGenerator(
                 n_stumps_per_attribute=self.n_stumps,
                 self_complemented=self.self_complemented)
         if self.estimators_generator == "Trees":
->>>>>>> 258ada8c7e5025f984b03343596557abe8d3f5a4
             self.estimators_generator = TreeClassifiersGenerator(
                 n_trees=self.n_stumps, max_depth=self.max_depth,
                 self_complemented=self.self_complemented)
diff --git a/summit/multiview_platform/monoview_classifiers/bagged_spkm.py b/summit/multiview_platform/monoview_classifiers/bagged_spkm.py
index 9b3c3a05cff95c7ee8e0e8950ece10e15604c27f..ebf32547b66d3ab0ceddfd5727ce6c716f71ea2e 100644
--- a/summit/multiview_platform/monoview_classifiers/bagged_spkm.py
+++ b/summit/multiview_platform/monoview_classifiers/bagged_spkm.py
@@ -11,10 +11,7 @@ from ..utils.hyper_parameter_search import CustomRandint
 from ..monoview_classifiers.spkm import SPKM
 
 classifier_class_name = "BaggedSPKM"
-<<<<<<< HEAD
-=======
 proto=True
->>>>>>> 258ada8c7e5025f984b03343596557abe8d3f5a4
 
 class BaggedSPKM(BaseMonoviewClassifier, SPKMlikeSklearn):
 
diff --git a/summit/multiview_platform/monoview_classifiers/bagging.py b/summit/multiview_platform/monoview_classifiers/bagging.py
index 8cbb15121a854c6ba82b105603c53fcc1ad92a83..0a89ace2b1b2e659825792e072aa3d51d4090006 100644
--- a/summit/multiview_platform/monoview_classifiers/bagging.py
+++ b/summit/multiview_platform/monoview_classifiers/bagging.py
@@ -16,10 +16,7 @@ __status__ = "Prototype"  # Production, Development, Prototype
 
 
 classifier_class_name = "Bagging"
-<<<<<<< HEAD
-=======
 proto=True
->>>>>>> 258ada8c7e5025f984b03343596557abe8d3f5a4
 
 class Bagging(BaggingClassifier, BaseMonoviewClassifier,):
     """
diff --git a/summit/multiview_platform/monoview_classifiers/bagging_pregen.py b/summit/multiview_platform/monoview_classifiers/bagging_pregen.py
index 60413fa539bc1952385ce4ed00bfa7fffb99fed1..4edebd456caf2e322f2c045807b9221aedb5333d 100644
--- a/summit/multiview_platform/monoview_classifiers/bagging_pregen.py
+++ b/summit/multiview_platform/monoview_classifiers/bagging_pregen.py
@@ -16,10 +16,7 @@ __status__ = "Prototype"  # Production, Development, Prototype
 
 
 classifier_class_name = "BaggingPregen"
-<<<<<<< HEAD
-=======
 proto=True
->>>>>>> 258ada8c7e5025f984b03343596557abe8d3f5a4
 
 class BaggingPregen(BaggingClassifier, BaseMonoviewClassifier,
                      PregenClassifier):
diff --git a/summit/multiview_platform/monoview_classifiers/cb_boost.py b/summit/multiview_platform/monoview_classifiers/cb_boost.py
index 9403ddb8373fdc94eb92a8caa238e5f4bb7687ae..56e980cb2a5bf5b58c955af297f2c478a2951536 100644
--- a/summit/multiview_platform/monoview_classifiers/cb_boost.py
+++ b/summit/multiview_platform/monoview_classifiers/cb_boost.py
@@ -77,16 +77,11 @@ class CBBoost(CBBoostClassifier, BaseMonoviewClassifier):
         -------
 
         """
-<<<<<<< HEAD
-        interpret_string = self.getInterpretCBBoost(directory, base_file_name, y_test)
-        interpret_string += self.get_feature_importance(directory, base_file_name)
-=======
         interpret_string = self.getInterpretCBBoost(directory, base_file_name,
                                                     y_test)
         interpret_string += self.get_feature_importance(directory,
                                                         base_file_name,
                                                         feature_ids)
->>>>>>> 258ada8c7e5025f984b03343596557abe8d3f5a4
         return interpret_string
 
     def get_name_for_fusion(self):
diff --git a/summit/multiview_platform/monoview_classifiers/cb_gradient_boost.py b/summit/multiview_platform/monoview_classifiers/cb_gradient_boost.py
index 7c1311d5a407d9f169414c97ff886e7691151308..9020de7c074a4cdd5480e7cb8e4c0de7175c2132 100644
--- a/summit/multiview_platform/monoview_classifiers/cb_gradient_boost.py
+++ b/summit/multiview_platform/monoview_classifiers/cb_gradient_boost.py
@@ -23,10 +23,7 @@ __author__ = "Baptiste Bauvin"
 __status__ = "Prototype"  # Production, Development, Prototype
 
 classifier_class_name = "CBGradientBoosting"
-<<<<<<< HEAD
-=======
 proto=True
->>>>>>> 258ada8c7e5025f984b03343596557abe8d3f5a4
 
 
 class CustomDecisionTreeGB(DecisionTreeClassifier):
diff --git a/summit/multiview_platform/monoview_classifiers/cg_desc.py b/summit/multiview_platform/monoview_classifiers/cg_desc.py
index f7350a9b0d7225cdf8d02b0a6d8485ab8f9128b5..ca04a97d4439ae5f9acbeaafa26e1fc12c315045 100644
--- a/summit/multiview_platform/monoview_classifiers/cg_desc.py
+++ b/summit/multiview_platform/monoview_classifiers/cg_desc.py
@@ -3,10 +3,7 @@ from ..monoview.monoview_utils import BaseMonoviewClassifier, CustomRandint
 
 
 classifier_class_name = "CGDesc"
-<<<<<<< HEAD
-=======
 proto=True
->>>>>>> 258ada8c7e5025f984b03343596557abe8d3f5a4
 
 class CGDesc(ColumnGenerationClassifierQar, BaseMonoviewClassifier):
     """
diff --git a/summit/multiview_platform/monoview_classifiers/cq_boost.py b/summit/multiview_platform/monoview_classifiers/cq_boost.py
index 0c5e56aad0a9577cf4def5d67833025f0a5a532e..d454b991249001b2d72fec0b836393d7b3f63b85 100644
--- a/summit/multiview_platform/monoview_classifiers/cq_boost.py
+++ b/summit/multiview_platform/monoview_classifiers/cq_boost.py
@@ -6,10 +6,7 @@ from ..monoview.monoview_utils import BaseMonoviewClassifier
 from ..utils.hyper_parameter_search import CustomRandint, CustomUniform
 
 classifier_class_name = "CQBoost"
-<<<<<<< HEAD
-=======
 proto=True
->>>>>>> 258ada8c7e5025f984b03343596557abe8d3f5a4
 
 class CQBoost(ColumnGenerationClassifier, BaseMonoviewClassifier):
 
diff --git a/summit/multiview_platform/monoview_classifiers/decision_tree_pregen.py b/summit/multiview_platform/monoview_classifiers/decision_tree_pregen.py
index 9dd7c3e51a6b134e280172ef27d06eb546a9605a..96b0aaa1498b8fbf2d73afebd4c7287a0607713c 100644
--- a/summit/multiview_platform/monoview_classifiers/decision_tree_pregen.py
+++ b/summit/multiview_platform/monoview_classifiers/decision_tree_pregen.py
@@ -12,10 +12,7 @@ __author__ = "Baptiste Bauvin"
 __status__ = "Prototype"  # Production, Development, Prototype
 
 classifier_class_name = "DecisionTreePregen"
-<<<<<<< HEAD
-=======
 proto=True
->>>>>>> 258ada8c7e5025f984b03343596557abe8d3f5a4
 
 class DecisionTreePregen(DecisionTreeClassifier, BaseMonoviewClassifier,
                          PregenClassifier):
diff --git a/summit/multiview_platform/monoview_classifiers/gradient_boosting_pregen.py b/summit/multiview_platform/monoview_classifiers/gradient_boosting_pregen.py
index 06fa81053adbac6981b0d5b22ef688468e174f6d..0ac5d519372fed4de2bec9de9adad9473bc12b35 100644
--- a/summit/multiview_platform/monoview_classifiers/gradient_boosting_pregen.py
+++ b/summit/multiview_platform/monoview_classifiers/gradient_boosting_pregen.py
@@ -17,10 +17,7 @@ __status__ = "Prototype"  # Production, Development, Prototype
 
 
 classifier_class_name = "GradientBoostingPregen"
-<<<<<<< HEAD
-=======
 proto=True
->>>>>>> 258ada8c7e5025f984b03343596557abe8d3f5a4
 
 class GradientBoostingPregen(GradientBoostingClassifier, BaseMonoviewClassifier,
                          PregenClassifier):
diff --git a/summit/multiview_platform/monoview_classifiers/hm_gb_cbound.py b/summit/multiview_platform/monoview_classifiers/hm_gb_cbound.py
index 820f0e8bd7c37e7d429527a59cd43377e9290898..24ee1097af7672e967d5485502acc696772972a3 100644
--- a/summit/multiview_platform/monoview_classifiers/hm_gb_cbound.py
+++ b/summit/multiview_platform/monoview_classifiers/hm_gb_cbound.py
@@ -7,10 +7,7 @@ import numpy.ma as ma
 import math
 
 classifier_class_name = "CBBoostGradientBoosting"
-<<<<<<< HEAD
-=======
 proto=True
->>>>>>> 258ada8c7e5025f984b03343596557abe8d3f5a4
 
 class CBBoostGradientBoosting(CBBoostClassifier, BaseMonoviewClassifier):
     """
diff --git a/summit/multiview_platform/monoview_classifiers/ib_random_forest.py b/summit/multiview_platform/monoview_classifiers/ib_random_forest.py
index f0bfffe360807b5bffd955806e053f30cc361b00..7f4517a1bcdef4d0642dd73b42e727206349d0a7 100644
--- a/summit/multiview_platform/monoview_classifiers/ib_random_forest.py
+++ b/summit/multiview_platform/monoview_classifiers/ib_random_forest.py
@@ -8,10 +8,7 @@ from ..utils.base import base_boosting_estimators
 from ..utils.hyper_parameter_search import CustomRandint, CustomUniform
 
 classifier_class_name = "IBRF"
-<<<<<<< HEAD
-=======
 proto=True
->>>>>>> 258ada8c7e5025f984b03343596557abe8d3f5a4
 
 class IBRF(BaseMonoviewClassifier, BalancedBaggingClassifier):
 
diff --git a/summit/multiview_platform/monoview_classifiers/ib_random_scm.py b/summit/multiview_platform/monoview_classifiers/ib_random_scm.py
index 965e939aa83a0d97c73980eff50e915cd4a53ede..11bd34b6b011c67a95920b59290195047518777d 100644
--- a/summit/multiview_platform/monoview_classifiers/ib_random_scm.py
+++ b/summit/multiview_platform/monoview_classifiers/ib_random_scm.py
@@ -8,10 +8,7 @@ from ..utils.base import base_boosting_estimators
 from ..utils.hyper_parameter_search import CustomRandint, CustomUniform
 
 classifier_class_name = "IBRSCM"
-<<<<<<< HEAD
-=======
 proto=True
->>>>>>> 258ada8c7e5025f984b03343596557abe8d3f5a4
 
 class IBRSCM(BaseMonoviewClassifier, BalancedBaggingClassifier):
 
diff --git a/summit/multiview_platform/monoview_classifiers/ib_scm.py b/summit/multiview_platform/monoview_classifiers/ib_scm.py
index 19fe10a132cb6d2a2f7fb17b26779b073392ea90..d7e38613fb8d041aff663f016c169756b16356ee 100644
--- a/summit/multiview_platform/monoview_classifiers/ib_scm.py
+++ b/summit/multiview_platform/monoview_classifiers/ib_scm.py
@@ -7,10 +7,7 @@ from ..utils.base import base_boosting_estimators
 from ..utils.hyper_parameter_search import CustomRandint, CustomUniform
 
 classifier_class_name = "IBSCM"
-<<<<<<< HEAD
-=======
 proto=True
->>>>>>> 258ada8c7e5025f984b03343596557abe8d3f5a4
 
 class IBSCM(BaseMonoviewClassifier, BalancedBaggingClassifier):
 
diff --git a/summit/multiview_platform/monoview_classifiers/imbalance_bagging.py b/summit/multiview_platform/monoview_classifiers/imbalance_bagging.py
index c141ed2f5667aa6501c5c02a3fd346d50840c311..f0b34878aa95fdcff44495659063ac5d2a545679 100644
--- a/summit/multiview_platform/monoview_classifiers/imbalance_bagging.py
+++ b/summit/multiview_platform/monoview_classifiers/imbalance_bagging.py
@@ -7,10 +7,7 @@ from ..utils.base import base_boosting_estimators
 from ..utils.hyper_parameter_search import CustomRandint, CustomUniform
 
 classifier_class_name = "ImbalanceBagging"
-<<<<<<< HEAD
-=======
 proto=True
->>>>>>> 258ada8c7e5025f984b03343596557abe8d3f5a4
 
 class ImbalanceBagging(BaseMonoviewClassifier, BalancedBaggingClassifier):
 
diff --git a/summit/multiview_platform/monoview_classifiers/min_cq.py b/summit/multiview_platform/monoview_classifiers/min_cq.py
index 35f06bf3900bbbae705f4c628caca3dde538145d..23298f1c9c14d2019fffb6d48a4329ce8ba9bdcf 100644
--- a/summit/multiview_platform/monoview_classifiers/min_cq.py
+++ b/summit/multiview_platform/monoview_classifiers/min_cq.py
@@ -23,10 +23,7 @@ from .additions.BoostUtils import ConvexProgram as QP
 
 
 classifier_class_name = "MinCQ"
-<<<<<<< HEAD
-=======
 proto=True
->>>>>>> 258ada8c7e5025f984b03343596557abe8d3f5a4
 
 # from majority_vote import MajorityVote
 # from voter import StumpsVotersGenerator, KernelVotersGenerator
diff --git a/summit/multiview_platform/monoview_classifiers/min_cq_graalpy.py b/summit/multiview_platform/monoview_classifiers/min_cq_graalpy.py
index 1cb8d2b3f6501c030d42d99d1166f6c98029c4ec..9c39e5ee90fd7a5e0e87b846f48a32b794193aa4 100644
--- a/summit/multiview_platform/monoview_classifiers/min_cq_graalpy.py
+++ b/summit/multiview_platform/monoview_classifiers/min_cq_graalpy.py
@@ -6,10 +6,7 @@ from ..monoview.monoview_utils import BaseMonoviewClassifier
 from ..utils.hyper_parameter_search import CustomRandint, CustomUniform
 
 classifier_class_name = "MinCQGraalpy"
-<<<<<<< HEAD
-=======
 proto=True
->>>>>>> 258ada8c7e5025f984b03343596557abe8d3f5a4
 
 class MinCQGraalpy(RegularizedBinaryMinCqClassifier, BaseMonoviewClassifier):
     """
diff --git a/summit/multiview_platform/monoview_classifiers/pregen_gradient_boost.py b/summit/multiview_platform/monoview_classifiers/pregen_gradient_boost.py
index 176c27073f6acc6c03ad9d9d1eafee99ab289c0a..3d11cea8d66c6543644aea518df765bb0356be77 100644
--- a/summit/multiview_platform/monoview_classifiers/pregen_gradient_boost.py
+++ b/summit/multiview_platform/monoview_classifiers/pregen_gradient_boost.py
@@ -17,10 +17,7 @@ __author__ = "Baptiste Bauvin"
 __status__ = "Prototype"  # Production, Development, Prototype
 
 classifier_class_name = "PGradientBoosting"
-<<<<<<< HEAD
-=======
 proto=True
->>>>>>> 258ada8c7e5025f984b03343596557abe8d3f5a4
 
 
 class CustomDecisionTreeGB(DecisionTreeClassifier):
@@ -63,19 +60,11 @@ class PGradientBoosting(GradientBoostingClassifier, BaseMonoviewClassifier, Base
     def pregen_voters(self, X, y=None, generator="Stumps"):
         if y is not None:
             neg_y = change_label_to_minus(y)
-<<<<<<< HEAD
-            if generator is "Stumps":
-                self.estimators_generator = StumpsClassifiersGenerator(
-                    n_stumps_per_attribute=self.n_stumps,
-                    self_complemented=self.self_complemented)
-            elif generator is "Trees":
-=======
             if generator == "Stumps":
                 self.estimators_generator = StumpsClassifiersGenerator(
                     n_stumps_per_attribute=self.n_stumps,
                     self_complemented=self.self_complemented)
             elif generator == "Trees":
->>>>>>> 258ada8c7e5025f984b03343596557abe8d3f5a4
                 self.estimators_generator = TreeClassifiersGenerator(
                     n_trees=self.n_stumps, max_depth=self.max_depth_pregen)
             self.estimators_generator.fit(X, neg_y)
diff --git a/summit/multiview_platform/monoview_classifiers/random_forest_pregen.py b/summit/multiview_platform/monoview_classifiers/random_forest_pregen.py
index 133474bf3e34cd90fa76d830c93b536a382e5ee9..31795606365c88109cd3c80c0f61443d7441840e 100644
--- a/summit/multiview_platform/monoview_classifiers/random_forest_pregen.py
+++ b/summit/multiview_platform/monoview_classifiers/random_forest_pregen.py
@@ -17,10 +17,7 @@ __status__ = "Prototype"  # Production, Development, Prototype
 
 
 classifier_class_name = "RandomForestPregen"
-<<<<<<< HEAD
-=======
 proto=True
->>>>>>> 258ada8c7e5025f984b03343596557abe8d3f5a4
 
 class RandomForestPregen(RandomForestClassifier, BaseMonoviewClassifier,
                     PregenClassifier):
diff --git a/summit/multiview_platform/monoview_classifiers/scm_mazid.py b/summit/multiview_platform/monoview_classifiers/scm_mazid.py
index ddc24b83e7a834175c821ef0f71529a4cb1146bd..f25d6e01dd24f4f207a3ea7616bce9cc1ee27985 100644
--- a/summit/multiview_platform/monoview_classifiers/scm_mazid.py
+++ b/summit/multiview_platform/monoview_classifiers/scm_mazid.py
@@ -9,10 +9,7 @@ from ..monoview.monoview_utils import BaseMonoviewClassifier
 from ..utils.hyper_parameter_search import CustomUniform, CustomRandint
 
 classifier_class_name = 'DecisionStumpSCMNew'
-<<<<<<< HEAD
-=======
 proto=True
->>>>>>> 258ada8c7e5025f984b03343596557abe8d3f5a4
 
 class DecisionStumpSCMNew(BaseMonoviewClassifier):
     """
diff --git a/summit/multiview_platform/monoview_classifiers/scm_pregen.py b/summit/multiview_platform/monoview_classifiers/scm_pregen.py
index 8d3e405a71b4ac8cae0632a72a4e609a66966609..dd2c8d50b02b2634310012bc8b19b3b0c44475b7 100644
--- a/summit/multiview_platform/monoview_classifiers/scm_pregen.py
+++ b/summit/multiview_platform/monoview_classifiers/scm_pregen.py
@@ -12,10 +12,7 @@ __author__ = "Baptiste Bauvin"
 __status__ = "Prototype"  # Production, Development, Prototype
 
 classifier_class_name = "SCMPregen"
-<<<<<<< HEAD
-=======
 proto=True
->>>>>>> 258ada8c7e5025f984b03343596557abe8d3f5a4
 
 class SCMPregen(BaseMonoviewClassifier, PregenClassifier, scm):
     """
diff --git a/summit/multiview_platform/monoview_classifiers/self_opt_cb.py b/summit/multiview_platform/monoview_classifiers/self_opt_cb.py
index 8d1fbcc9426788bdff30446143199bc2337a691a..aea3b0a89677210fb435deef140955a810ed3d8b 100644
--- a/summit/multiview_platform/monoview_classifiers/self_opt_cb.py
+++ b/summit/multiview_platform/monoview_classifiers/self_opt_cb.py
@@ -1,10 +1,7 @@
 from .additions.SelOptCB import SelfOptCBBoostClassifier
 
 classifier_class_name = "SelfOptCBBoostBaseStump"
-<<<<<<< HEAD
-=======
 proto=True
->>>>>>> 258ada8c7e5025f984b03343596557abe8d3f5a4
 
 class SelfOptCBBoostBaseStump(SelfOptCBBoostClassifier):
     def __init__(self, n_max_iterations=10, random_state=42, twice_the_same=True,
diff --git a/summit/multiview_platform/monoview_classifiers/self_opt_cb_pseudo.py b/summit/multiview_platform/monoview_classifiers/self_opt_cb_pseudo.py
index e040fb50c38dee8b5ae0afa27d67fc0c69eb799f..80913fc1891ffa31701a18a2deb568e17fac6e0e 100644
--- a/summit/multiview_platform/monoview_classifiers/self_opt_cb_pseudo.py
+++ b/summit/multiview_platform/monoview_classifiers/self_opt_cb_pseudo.py
@@ -1,10 +1,7 @@
 from .additions.SelOptCB import SelfOptCBBoostClassifier
 
 classifier_class_name = "SelfOptCBBoostBaseStump"
-<<<<<<< HEAD
-=======
 proto=True
->>>>>>> 258ada8c7e5025f984b03343596557abe8d3f5a4
 
 class SelfOptCBBoostBaseStump(SelfOptCBBoostClassifier):
     def __init__(self, n_max_iterations=10, random_state=42, twice_the_same=True,
diff --git a/summit/multiview_platform/monoview_classifiers/self_opt_cb_root.py b/summit/multiview_platform/monoview_classifiers/self_opt_cb_root.py
index 8843853019386b18554aa82a6ecd3abf3b0ae7c1..385f3656d60705c0a8b8dd7a2687b11ce957aa45 100644
--- a/summit/multiview_platform/monoview_classifiers/self_opt_cb_root.py
+++ b/summit/multiview_platform/monoview_classifiers/self_opt_cb_root.py
@@ -1,10 +1,7 @@
 from .additions.SelOptCB import SelfOptCBBoostClassifier
 
 classifier_class_name = "SelfOptCBBoostBaseStump"
-<<<<<<< HEAD
-=======
 proto=True
->>>>>>> 258ada8c7e5025f984b03343596557abe8d3f5a4
 
 class SelfOptCBBoostBaseStump(SelfOptCBBoostClassifier):
     def __init__(self, n_max_iterations=10, random_state=42, twice_the_same=True,
diff --git a/summit/multiview_platform/monoview_classifiers/spkm.py b/summit/multiview_platform/monoview_classifiers/spkm.py
index 5976ccac2a1f7665659b4e76acada7e640ff6ff4..7c6f4c7ce1f59cdc8a0fc5819680d37c5216c74b 100644
--- a/summit/multiview_platform/monoview_classifiers/spkm.py
+++ b/summit/multiview_platform/monoview_classifiers/spkm.py
@@ -9,10 +9,7 @@ from ..utils.hyper_parameter_search import CustomRandint
 from ..utils.dataset import get_samples_views_indices
 
 classifier_class_name = "SPKM"
-<<<<<<< HEAD
-=======
 proto=True
->>>>>>> 258ada8c7e5025f984b03343596557abe8d3f5a4
 
 class SPKM(BaseMonoviewClassifier, SPKMlikeSklearn):