diff --git a/src/common/turb/mode_bl_depth_diag.F90 b/src/common/turb/mode_bl_depth_diag.F90
index 4725a1124e123ef1ba1fa9cd9a4e35e06b1f41e6..8035cbee835e6270ab83196683d3748594d7935c 100644
--- a/src/common/turb/mode_bl_depth_diag.F90
+++ b/src/common/turb/mode_bl_depth_diag.F90
@@ -87,12 +87,13 @@ DO JIJ=IIJB,IIJE
     IF (PSURF(JIJ)/=0.) THEN
     DO JK=IKB,IKE,IKL
       IF (PZZ(JIJ,JK-IKL)>PZS(JIJ)) THEN
-      ZFLX = PSURF(JIJ) * PFTOP_O_FSURF
-      IF ( (PFLUX(JIJ,JK)-ZFLX)*(PFLUX(JIJ,JK-IKL)-ZFLX) <= 0. ) THEN
-        BL_DEPTH_DIAG3D(JIJ) = (PZZ  (JIJ,JK-IKL) - PZS(JIJ))     &
+        ZFLX = PSURF(JIJ) * PFTOP_O_FSURF
+        IF ( (PFLUX(JIJ,JK)-ZFLX)*(PFLUX(JIJ,JK-IKL)-ZFLX) <= 0. ) THEN
+          BL_DEPTH_DIAG3D(JIJ) = (PZZ  (JIJ,JK-IKL) - PZS(JIJ))     &
                          + (PZZ  (JIJ,JK) - PZZ  (JIJ,JK-IKL))    &
                          * (ZFLX          - PFLUX(JIJ,JK-IKL)  )  &
                          / (PFLUX(JIJ,JK) - PFLUX(JIJ,JK-IKL)   )
+        END IF
       END IF
     END DO
   END IF
diff --git a/src/common/turb/th_r_from_thl_rt.func.h b/src/common/turb/th_r_from_thl_rt.func.h
index 4c2ce06d9bf094c0ebfdad3845dcacb4480b4b98..e123888156d937b4129b191428ca545ad31bcf85 100644
--- a/src/common/turb/th_r_from_thl_rt.func.h
+++ b/src/common/turb/th_r_from_thl_rt.func.h
@@ -180,13 +180,8 @@ DO II=1,JITER
               & PBUF(JIJ, IDRSATODTI)*PFRAC_ICE(JIJ))
 
     !Computation of new PRL, PRI and PRV
-<<<<<<< HEAD
-    !Correction term applied to (PRV(J)-PBUF(J, IRVSAT)) is computed assuming that
-    !PBUF(J, ILVOCPEXN), PBUF(J, ILSOCPEXN) and PBUF(J, ICPH) don't vary too much with T. It takes into account
-=======
     !Correction term applied to (PRV(JIJ)-PBUF(JIJ, IRVSAT)) is computed assuming that
-    !PBUF(JIJ, ILVOCPEXN), PBUF(JIJ, ILSOCPEXN) and PBUF(JIJ, ICPH) don't vary to much with T. It takes into account
->>>>>>> 1322004e (Normalize use of J, IE and IB to JIJ, IIJE, IIJB in include .h file)
+    !PBUF(JIJ, ILVOCPEXN), PBUF(JIJ, ILSOCPEXN) and PBUF(JIJ, ICPH) don't vary too much with T. It takes into account
     !the variation (estimated linear) of Qsat with T
     PBUF(JIJ, IRLTEMP)=(PRV(JIJ)-PBUF(JIJ, IRVSAT))/ &
                   &(1 + PBUF(JIJ, IDRSATODT)*PBUF(JIJ, IEXN)* &