diff --git a/pyicon/quickplots/qp_driver.py b/pyicon/quickplots/qp_driver.py
index 184a75171338ffafa3336e267b6a1cddac093e2f..118f9723cb5a605633c1ed7a2145945ed7fa1ae2 100644
--- a/pyicon/quickplots/qp_driver.py
+++ b/pyicon/quickplots/qp_driver.py
@@ -1282,6 +1282,7 @@ for tave_int in tave_ints:
     fig_name = 'ssh'
     if fig_name in fig_names:
       try:
+<<<<<<< HEAD
         FigInf = pyicqp.qp_hplot(fpath=path_data+fname, var='zos', depth=0, it=0,
                                  t1=t1, t2=t2,
                                  clim=2, cincr=0.2, cmap='RdBu_r',
@@ -1289,6 +1290,17 @@ for tave_int in tave_ints:
                                  save_data=save_data, fpath_nc=path_nc+fig_name+'.nc',
                                  **Ddict_global)
         save_fig('SSH', path_pics, fig_name, FigInf)
+=======
+        
+        FigInf = pyicqp.qp_hplot(fpath=path_data+fname, var='zos', depth=0, it=0,
+                                t1=t1, t2=t2,
+                                clim=2, cincr=0.2, cmap='RdBu_r',
+                                IcD=DIcD['monthly'],
+                                save_data=save_data, fpath_nc=path_nc+fig_name+'.nc',
+                                **Ddict_global)
+        save_fig('SSH', path_pics, fig_name, FigInf)
+
+>>>>>>> 9865f38 (fixed some indentation problems)
       except:
         try:
           FigInf = pyicqp.qp_hplot(fpath=path_data+fname, var='ssh', depth=0, it=0,