particles.cpp cleaned up
fix merge problem