clean up master & feature branch merge

components/elm/src/main/controlMod.F90

@@ -723,15 +723,8 @@ subroutine control_spmd()
     call mpi_bcast (use_vertsoilc, 1, MPI_LOGICAL, 0, mpicom, ier)
     call mpi_bcast (use_extralakelayers, 1, MPI_LOGICAL, 0, mpicom, ier)
     call mpi_bcast (use_extrasnowlayers, 1, MPI_LOGICAL, 0, mpicom, ier)
-<<<<<<< HEAD
-<<<<<<< HEAD
     call mpi_bcast (use_firn_percolation_and_compaction, 1, MPI_LOGICAL, 0, mpicom, ier)
-=======
-    call mpi_bcast (use_snow_thk, 1, MPI_LOGICAL, 0, mpicom, ier)
->>>>>>> aa0f583905 (Added new snow Thermal Conductivity in SoilTemperatureMod.F90)
-=======
     call mpi_bcast (use_T_rho_dependent_snowthk, 1, MPI_LOGICAL, 0, mpicom, ier)
->>>>>>> 7d87f8c1ac (changed flag name for new snow thk flag to be more descriptive)
     call mpi_bcast (use_vichydro, 1, MPI_LOGICAL, 0, mpicom, ier)
     call mpi_bcast (use_century_decomp, 1, MPI_LOGICAL, 0, mpicom, ier)
     call mpi_bcast (use_cn, 1, MPI_LOGICAL, 0, mpicom, ier)
@@ -1032,15 +1025,8 @@ subroutine control_print ()
     write(iulog,*) '    use_lake_wat_storage = ', use_lake_wat_storage
     write(iulog,*) '    use_extralakelayers = ', use_extralakelayers
     write(iulog,*) '    use_extrasnowlayers = ', use_extrasnowlayers
-<<<<<<< HEAD
-<<<<<<< HEAD
     write(iulog,*) '    use_firn_percolation_and_compaction = ', use_firn_percolation_and_compaction
-=======
-    write(iulog,*) '    use_snow_thk = ', use_snow_thk
->>>>>>> aa0f583905 (Added new snow Thermal Conductivity in SoilTemperatureMod.F90)
-=======
     write(iulog,*) '    use_T_rho_dependent_snowthk = ', use_T_rho_dependent_snowthk
->>>>>>> 7d87f8c1ac (changed flag name for new snow thk flag to be more descriptive)
     write(iulog,*) '    use_vichydro = ', use_vichydro
     write(iulog,*) '    use_century_decomp = ', use_century_decomp
     write(iulog,*) '    use_cn = ', use_cn