cats.php merge fixes