added particle
fix conflict