diff --git a/Source/Particles/PhysicalParticleContainer.cpp b/Source/Particles/PhysicalParticleContainer.cpp
index 5f2981c0a04..27dbb51d2c2 100644
--- a/Source/Particles/PhysicalParticleContainer.cpp
+++ b/Source/Particles/PhysicalParticleContainer.cpp
@@ -570,12 +570,18 @@ PhysicalParticleContainer::AddGaussianBeam (
                 amrex::Real vz = u.z / gamma * PhysConst::c;
                 amrex::Real t = (z_f - z)/vz;
 
+<<<<<<< Updated upstream
                 amrex::AllPrint() << "BEFORE x = " << x << " y = " << y << std::endl;
 
                 x = x -  vx * t;
                 y = y -  vy * t;
 
                 amrex::AllPrint() << "AFTER x = " << x << " y = " << y << std::endl;
+=======
+                x = x -  vx * t; 
+                y = y -  vy * t; 
+
+>>>>>>> Stashed changes
                 u.x *= PhysConst::c;
                 u.y *= PhysConst::c;
                 u.z *= PhysConst::c;