Resolutionde conflits

...ifiers/multiview_classifiers/additions/diversity_utils.py

...assifiers/multiview_classifiers/additions/fusion_utils.py

...iers/multiview_classifiers/additions/late_fusion_utils.py

...ifiers/multiview_classifiers/bayesian_inference_fusion.py

...ew_classifiers/multiview_classifiers/difficulty_fusion.py

...ultiview_classifiers/difficulty_fusion/analyze_results.py

...tiview_classifiers/difficulty_fusion/difficulty_fusion.py

...view_classifiers/multiview_classifiers/disagree_fusion.py

.../multiview_classifiers/disagree_fusion/analyze_results.py

.../multiview_classifiers/disagree_fusion/disagree_fusion.py

..._classifiers/multiview_classifiers/double_fault_fusion.py

...tiview_classifiers/double_fault_fusion/analyze_results.py

...ew_classifiers/double_fault_fusion/double_fault_fusion.py

..._view_classifiers/multiview_classifiers/entropy_fusion.py

...s/multiview_classifiers/entropy_fusion/analyze_results.py

...rs/multiview_classifiers/entropy_fusion/entropy_fusion.py

...fiers/multiview_classifiers/fusion/Methods/EarlyFusion.py

...fiers/fusion/Methods/EarlyFusionPackage/WeightedLinear.py

...classifiers/fusion/Methods/EarlyFusionPackage/__init__.py

...ifiers/multiview_classifiers/fusion/Methods/LateFusion.py