Correct merge mistakes in classes/handler/public.php.