fix merge (phpunit error)