Fix conversation collisions