diff --git a/src/cmfd_execute.F90 b/src/cmfd_execute.F90
index 23476bb876..adccdc503a 100644
--- a/src/cmfd_execute.F90
+++ b/src/cmfd_execute.F90
@@ -3,7 +3,8 @@ module cmfd_execute
   use cmfd_data,         only: set_up_cmfd
   use cmfd_output,       only: write_cmfd_vtk
   use global,            only: cmfd,cmfd_only,time_cmfd,master,rank,mpi_err,   &
- &                             current_cycle,n_inactive,n_cycles,n_procs,n_procs_cmfd
+ &                             current_batch,n_inactive,n_batches,n_procs,     &
+ &                             n_procs_cmfd
   use timing,            only: timer_start,timer_stop,timer_reset
 
 
@@ -37,7 +38,7 @@ contains
     if (rank < 1) then
 
       ! initialize slepc/petsc (communicates to world)
-      if(current_cycle == n_inactive + 1) call SlepcInitialize                 &
+      if(current_batch == n_inactive + 1) call SlepcInitialize                 &
      &                                       (PETSC_NULL_CHARACTER,ierr)
 
       ! set global variable for number of procs in cmfd calc
@@ -76,7 +77,7 @@ contains
       end if
 
       ! finalize slepc
-      if (current_cycle == n_cycles) call SlepcFinalize(ierr)
+      if (current_batch == n_batches) call SlepcFinalize(ierr)
 
     end if
 
diff --git a/src/cmfd_output.F90 b/src/cmfd_output.F90
index 7f8eced2bf..61dffebe4a 100644
--- a/src/cmfd_output.F90
+++ b/src/cmfd_output.F90
@@ -18,7 +18,7 @@ contains
   subroutine neutron_balance()
 
     use constants, only: ONE
-    use global,    only: cmfd,keff,MAX_FILE_LEN,current_cycle
+    use global,    only: cmfd,keff,MAX_FILE_LEN
     use string
 
     integer :: i            ! iteration counter for x
@@ -111,7 +111,7 @@ contains
 
   subroutine write_cmfd_hdf5()
 
-    use global, only: cmfd,cmfd_coremap,current_cycle,keff,entropy,entropy_on
+    use global, only: cmfd,cmfd_coremap,current_batch,keff,entropy,entropy_on
     use string, only: to_str
 
 #ifdef HDF5
@@ -133,8 +133,8 @@ contains
     nz = cmfd % indices(3)
     ng = cmfd % indices(4)
 
-    ! get the cycle name
-    cycname = "cycle"//trim(to_str(current_cycle))
+    ! get the batch name
+    cycname = "batch"//trim(to_str(current_batch))
 
     ! create the CMFD group
     call h5gcreate_f(hdf5_output_file,trim(cycname),cycle_id,hdf5_err)
diff --git a/src/global.F90 b/src/global.F90
index 0068021c64..2c191359ed 100644
--- a/src/global.F90
+++ b/src/global.F90
@@ -218,9 +218,6 @@ module global
   ! Message used in message/warning/fatal_error
   character(MAX_LINE_LEN) :: message
 
-  ! Random number seed
-  integer(8) :: seed = 1_8
-
   ! Problem type
   integer :: problem_type = PROB_CRITICALITY
 
diff --git a/src/input_xml.F90 b/src/input_xml.F90
index 146c04ca5b..117ca28891 100644
--- a/src/input_xml.F90
+++ b/src/input_xml.F90
@@ -115,10 +115,6 @@ contains
        call fatal_error()
     end if
 
-<<<<<<< HEAD:src/input_xml.F90
-    ! Random number seed
-    if (dble(criticality % seed) > 0.0_8)  seed = dble(criticality % seed)
-=======
     ! Copy random number seed if specified
     if (seed_ > 0) seed = seed_
 
@@ -135,7 +131,6 @@ contains
        message = "Unknown energy grid method: " // energy_grid_
        call fatal_error()
     end select
->>>>>>> master:src/input_xml.F90
 
     ! Verbosity
     if (verbosity_ > 0) verbosity = verbosity_
diff --git a/src/main.F90 b/src/main.F90
index 58e911d6f5..ff5e854186 100644
--- a/src/main.F90
+++ b/src/main.F90
@@ -54,7 +54,6 @@ contains
 
     ! Display column titles
     if (entropy_on) then
-<<<<<<< HEAD:src/main.F90
       if (cmfd_on) then
        message = " Cycle   k(batch)   Entropy         Average k         CMFD k    CMFD Ent."
        call write_message(1)
diff --git a/src/output.F90 b/src/output.F90
index aa9b414a25..88f0d32ec5 100644
--- a/src/output.F90
+++ b/src/output.F90
@@ -961,16 +961,10 @@ contains
     write(ou,100) "Total time in simulation", time_inactive % elapsed + &
          time_active % elapsed
     write(ou,100) "  Time in transport only", time_transport % elapsed
-<<<<<<< HEAD:src/output.F90
-    write(ou,100) "  Time in inactive cycles", time_inactive % elapsed
-    write(ou,100) "  Time in active cycles", time_active % elapsed
-    write(ou,100) "  Time between cycles", time_intercycle % elapsed
     if(cmfd_on) write(ou,100) "Total CMFD time", time_cmfd % elapsed
-=======
     write(ou,100) "  Time in inactive batches", time_inactive % elapsed
     write(ou,100) "  Time in active batches", time_active % elapsed
     write(ou,100) "  Time between generations", time_intercycle % elapsed
->>>>>>> master:src/output.F90
     write(ou,100) "    Accumulating tallies", time_ic_tallies % elapsed
     write(ou,100) "    Sampling source sites", time_ic_sample % elapsed
     write(ou,100) "    SEND/RECV source sites", time_ic_sendrecv % elapsed