diff --git a/CMakeLists.txt b/CMakeLists.txt
index ea2ddc52ff..04a42817bb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -114,17 +114,10 @@ if(CMAKE_Fortran_COMPILER_ID STREQUAL GNU)
   endif()
 
   # GCC compiler options
-<<<<<<< HEAD
-  list(APPEND f90flags -cpp -std=f2008ts -fbacktrace -O2 -g)
-  if(debug)
-    list(REMOVE_ITEM f90flags -O2)
-    list(APPEND f90flags -g -enable-checking -fbacktrace -Wall -Wno-unused-dummy-argument -pedantic
-=======
   list(APPEND f90flags -cpp -std=f2008ts -fbacktrace -O2 -fstack-arrays)
   if(debug)
     list(REMOVE_ITEM f90flags -O2 -fstack-arrays)
     list(APPEND f90flags -g -Wall -Wno-unused-dummy-argument -pedantic
->>>>>>> 47fbf8282ea94c138f75219bd10fdb31501d3fb7
       -fbounds-check -ffpe-trap=invalid,overflow,underflow)
     list(APPEND ldflags -g -v -da -Q)
   endif()
diff --git a/src/simulation.F90 b/src/simulation.F90
index e1a1dcc750..8fe4f025c3 100644
--- a/src/simulation.F90
+++ b/src/simulation.F90
@@ -507,11 +507,6 @@ contains
     ! Broadcast tally results so that each process has access to results
     if (allocated(tallies)) then
       do i = 1, size(tallies)
-<<<<<<< HEAD
-        n = size(tallies(i) % obj % results)
-        call MPI_BCAST(tallies(i) % obj % results, n, MPI_DOUBLE, 0, &
-             mpi_intracomm, mpi_err)
-=======
         associate (results => tallies(i) % obj % results)
           ! Create a new datatype that consists of all values for a given filter
           ! bin and then use that to broadcast. This is done to minimize the
@@ -524,7 +519,6 @@ contains
           call MPI_BCAST(results, n, result_block, 0, mpi_intracomm, mpi_err)
           call MPI_TYPE_FREE(result_block, mpi_err)
         end associate
->>>>>>> 47fbf8282ea94c138f75219bd10fdb31501d3fb7
       end do
     end if