Local change
Resolved the conflict
Another collision
Resolved collision