diff --git a/src/Modules.py b/src/Modules.py
index 7369de802eba859b42a966c130b02cf61f477ece..696f1b53fbe56c7d117ce4cd66ed4b79e6658622 100644
--- a/src/Modules.py
+++ b/src/Modules.py
@@ -1,9 +1,5 @@
-<<<<<<< HEAD
-from Class_Mod import PlsR, LinearPCA, Umap, find_col_index, PinardPlsr, Nmf
-=======
 from Packages import *
 from Class_Mod import PlsR, LinearPCA, Umap, find_col_index, PinardPlsr
->>>>>>> 62640b80a4da8925b8fe9e07a1be60df55c54ff7
 from Class_Mod import LWPLSR, list_files, metrics, TpeIpls, reg_plot, resid_plot, Sk_Kmeans, DxRead, Hdbscan, read_dx, PlsProcess
 from Class_Mod.DATA_HANDLING import *
 from Class_Mod.Miscellaneous import prediction, download_results, plot_spectra, local_css