Fixes merge.php (it now works properly in a reasonable time).