Merge TestController.php