Fixed merge, fixed multiplayer movement