Add server-side collision management