diff --git a/src/proteus/plot/cpl_global.py b/src/proteus/plot/cpl_global.py
index 1254aa93..1fe68f7a 100644
--- a/src/proteus/plot/cpl_global.py
+++ b/src/proteus/plot/cpl_global.py
@@ -12,15 +12,10 @@
 from proteus.utils.constants import volatile_species
 from proteus.utils.plot import dict_colors, vol_latex, vol_zorder
 
-<<<<<<< HEAD
-log = logging.getLogger("fwl."+__name__)
-=======
 if TYPE_CHECKING:
     from proteus import Proteus
-
-
-log = logging.getLogger("PROTEUS")
->>>>>>> master
+    
+log = logging.getLogger("fwl."+__name__)
 
 def plot_global(output_dir: str , options: dict, logt: bool=True, tmin: float=1e1):
 
diff --git a/src/proteus/plot/cpl_sflux.py b/src/proteus/plot/cpl_sflux.py
index ed0f3660..f83d8253 100644
--- a/src/proteus/plot/cpl_sflux.py
+++ b/src/proteus/plot/cpl_sflux.py
@@ -117,7 +117,7 @@ def plot_sflux(output_dir: str, wl_max: float = 6000.0, plot_format: str="pdf"):
         cbar = fig.colorbar(sm, cax=cax, orientation='vertical')
         cbar.set_label("Time [yr]")
     else:
-        print("Only one spectrum was found")
+        log.warning("Only one spectrum was found")
 
     ax.set_yscale("log")
     ax.set_ylabel("Flux [erg s-1 cm-2 nm-1]")