Fix conflicrs

Author: luisas

conf/test.config

@@ -18,11 +18,7 @@ params {
     data         = params.pipelines_testdata_base_path + 'deepmodeloptim/testdata/titanic/titanic_stimulus.csv'
     data_config  = params.pipelines_testdata_base_path + 'deepmodeloptim/testdata/titanic/titanic.yaml'
     model        = params.pipelines_testdata_base_path + 'deepmodeloptim/testdata/titanic/titanic_model.py'
-<<<<<<< HEAD
     model_config = params.pipelines_testdata_base_path + 'deepmodeloptim/testdata/titanic/titanic_model.yaml'
-=======
-    model_config = params.pipelines_testdata_base_path + 'deepmodeloptim/testdata/titanic/titanic_model_cpu.yaml'
->>>>>>> dev
 
     // output
     save_data    = true