diff --git a/ccpp/physics b/ccpp/physics
index c552057f5..93bc2c84c 160000
--- a/ccpp/physics
+++ b/ccpp/physics
@@ -1 +1 @@
-Subproject commit c552057f566d4a3b75c6ea2689450b3a084d8338
+Subproject commit 93bc2c84c175a10b09e213d27737402bcf83e62b
diff --git a/scm/src/GFS_typedefs.F90 b/scm/src/GFS_typedefs.F90
index e7715ce5e..3c8d8d3e8 100644
--- a/scm/src/GFS_typedefs.F90
+++ b/scm/src/GFS_typedefs.F90
@@ -1232,13 +1232,8 @@ module GFS_typedefs
     real(kind=kind_phys) :: bl_mynn_closure    !< flag to determine closure level of MYNN
     logical              :: sfclay_compute_flux!< flag for thermal roughness lengths over water in mynnsfclay
     logical              :: sfclay_compute_diag!< flag for computing surface diagnostics in mynnsfclay
-<<<<<<< HEAD
-    integer              :: isftcflx           !< flag for thermal roughness lengths over water in mynnsfclay
-    integer              :: iz0tlnd            !< flag for thermal roughness lengths over land in mynnsfclay
-=======
     integer              :: isftcflx           !< flag for thermal roughness lengths over water in mynnsfclay and mmm sfclayrev
     integer              :: iz0tlnd            !< flag for thermal roughness lengths over land in mynnsfclay and mmm sfclayrev
->>>>>>> weiwei/mmm_phy
     real(kind=kind_phys) :: var_ric
     real(kind=kind_phys) :: coef_ric_l
     real(kind=kind_phys) :: coef_ric_s
@@ -4008,14 +4003,8 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
                                do_ugwp_v1, do_ugwp_v1_orog_only,  do_ugwp_v1_w_gsldrag,     &
                                ugwp_seq_update, var_ric, coef_ric_l, coef_ric_s, hurr_pbl,  &
                                do_myjsfc, do_myjpbl,                                        &
-<<<<<<< HEAD
-                               hwrf_samfdeep, hwrf_samfshal,progsigma,betascu,betamcu,      &
-                               betadcu,h2o_phys, pdfcld, shcnvcw, redrag, hybedmf, satmedmf,&
-                               shinhong, do_ysu, dspheat, lheatstrg, lseaspray, cnvcld,     &
-                               random_clds, shal_cnv, imfshalcnv, imfdeepcnv, isatmedmf,    &
-                               do_deep, jcap,                                               &
-=======
                                hwrf_samfdeep, hwrf_samfshal,progsigma,                      &
+                               betascu, betamcu, betadcu,                                   &
                                h2o_phys, pdfcld, shcnvcw, redrag, hybedmf, satmedmf,        &
                                shinhong, do_ysu, do_ysu_cldliq, do_ysu_cldice, ysu_add_bep, &
                                ysu_topdown_pblmix, ysu_timesplit,                           &
@@ -4025,7 +4014,6 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
                                acm, dspheat, lheatstrg,                                     &
                                lseaspray, cnvcld, random_clds, shal_cnv, imfshalcnv,        &
                                imfdeepcnv, isatmedmf, do_deep, jcap,                        &
->>>>>>> weiwei/mmm_phy
                                cs_parm, flgmin, cgwf, ccwf, cdmbgwd, sup, ctei_rm, crtrh,   &
                                dlqf, rbcr, shoc_parm, psauras, prauras, wminras,            &
                                do_sppt, do_shum, do_skeb,                                   &
diff --git a/scm/src/scm_physical_constants.F90 b/scm/src/scm_physical_constants.F90
index 5e4c6eda7..6e32aa0be 100644
--- a/scm/src/scm_physical_constants.F90
+++ b/scm/src/scm_physical_constants.F90
@@ -36,6 +36,7 @@ module scm_physical_constants
   real(kind=dp),parameter:: con_eps    =con_rd/con_rv
   real(kind=dp),parameter:: con_epsm1  =con_rd/con_rv - 1._dp
   real(kind=dp),parameter:: con_1ovg   =1._dp/con_g
+  real(kind=dp),parameter:: con_1ograv =con_1ovg
 
   real(kind=dp),parameter:: karman = 0.4_dp