Player movement and joining
Merge resolution