diff --git a/phys/module_sf_noahdrv.F b/phys/module_sf_noahdrv.F
index 6afae66b82..f62b2b6117 100644
--- a/phys/module_sf_noahdrv.F
+++ b/phys/module_sf_noahdrv.F
@@ -702,11 +702,7 @@ SUBROUTINE lsm(DZ8W,QV3D,P8W3D,T3D,TSK,                      &
    REAL :: frc_urb,lb_urb
    REAL :: check 
 !CORDEX
-<<<<<<< HEAD
    real aa_veg,a2_veg,ptg_rur,zhalf
-=======
-   real aa_veg,a2_veg
->>>>>>> v4.5.1.7-devel
 !CORDEX
 ! ----------------------------------------------------------------------
 ! DECLARATIONS END - urban
@@ -1780,28 +1776,12 @@ SUBROUTINE lsm(DZ8W,QV3D,P8W3D,T3D,TSK,                      &
 !                endif
 !CORDEX here I do a simple log interpolation between the surface temperature of the vegetated frction, tsk_rural, and the lowest
 !model level value of temperature
-<<<<<<< HEAD
              zhalf=dz8w(i,1,j)/2.
              aa_veg=0.4/alog(zhalf/znt(i,j))
              a2_veg=0.4/alog(2./znt(i,j))
              ptg_rur=tsk_rural(i,j)*(1.e5/p_phy(i,1,j))**0.286
              t2veg_urb2d(i,j)=(1.-aa_veg/a2_veg)*ptg_rur+aa_veg/a2_veg*th_phy(i,1,j)
              t2veg_urb2d(i,j)=t2veg_urb2d(i,j)*(p_phy(i,1,j)/1.e5)**0.286
-
-             
-=======
-             aa_veg=alog(dz8w(i,1,j)/2./znt(i,j))
-             a2_veg=alog(2/znt(i,j))
-             t2veg_urb2d(i,j)=(1.-aa_veg/a2_veg)*tsk_rural(i,j)+aa_veg/a2_veg*th_phy(i,1,j)
-!             write(*,*)'znt=',znt(i,j)
-!             write(*,*)'aa_veg=',aa_veg
-!             write(*,*)'a2_veg=',a2_veg
-!             write(*,*)'tsk_rural=',tsk_rural(i,j)
-!             write(*,*)'th_phy=',th_phy(i,1,j)
-!             write(*,*)'p_phy=',p_phy(i,1,j)
-             
-             t2veg_urb2d(i,j)=t2veg_urb2d(i,j)*(p_phy(i,1,j)/1.e5)**0.286
->>>>>>> v4.5.1.7-devel
 !CORDEX
             else
               SH_URB2D(I,J)    = 0.