Adedd Particle Manager to the main file
conflict fix