Fix merge conflict

TODO.md

code/bolsonaro/models/ensemble_selection_forest_regressor.py

code/bolsonaro/models/model_factory.py

code/bolsonaro/models/omp_forest.py

code/bolsonaro/models/omp_forest_classifier.py

code/bolsonaro/trainer.py

code/compute_results.py

code/train.py

experiments/boston/stage1/none_with_params.json

experiments/boston/stage1/none_wo_params.json

experiments/boston/stage1/omp_with_params.json

experiments/boston/stage1/omp_wo_params.json

experiments/boston/stage1/random_with_params.json

experiments/boston/stage1/random_wo_params.json

experiments/boston/stage2/no_normalization.json

experiments/boston/stage2/normalize_D.json

experiments/boston/stage2/normalize_D_and_weights.json

experiments/boston/stage2/normalize_weights.json

experiments/boston/stage3/train-dev_subset.json

experiments/boston/stage3/train-dev_train-dev_subset.json