diff --git a/powder.c b/powder.c
index 2f8642bce..750beaa83 100644
--- a/powder.c
+++ b/powder.c
@@ -3266,7 +3266,6 @@ justdraw:
 											blendpixel(vid, nx-tempx, ny-tempy, cr, cg, cb, 5);
 										}
 									}
->>>>>>> simon/master
                 } else if(t==PT_PLSM)
                 {
                     float ttemp = parts[i].life;