Resolve collisions next update