diff --git a/Source/Particles/ParticleBoundaryBuffer.cpp b/Source/Particles/ParticleBoundaryBuffer.cpp
index 4ea1b7c220c..0e2f70b301b 100644
--- a/Source/Particles/ParticleBoundaryBuffer.cpp
+++ b/Source/Particles/ParticleBoundaryBuffer.cpp
@@ -487,11 +487,7 @@ void ParticleBoundaryBuffer::gatherParticles (MultiParticleContainer& mypc,
                           const int step = warpx_instance.getistep(0);
                           amrex::filterAndTransformParticles(ptile_buffer, ptile,
                                                              predicate,
-<<<<<<< HEAD
-                                                             CopyAndTimestamp{step_scraped_index, delta_index, normal_index, step, dt, idim, iside},
-=======
                                                              CopyAndTimestamp{step_scraped_index, delta_index, normal_index, step, dt, plo, phi, idim, iside},
->>>>>>> b0b635458 (draft)
                                                              0, dst_index);
                         }
                     }
@@ -626,4 +622,4 @@ ParticleBoundaryBuffer::getParticleBufferPointer(const std::string species_name,
     auto index = WarpX::GetInstance().GetPartContainer().getSpeciesID(species_name);
 
     return &buffer[index];
-}
\ No newline at end of file
+}