finished particles
resolved conflicts