Glow particles

conflict resolutions