particle emitters basic stuff
fix merge