fixed phpunit.xml path
fixed merge conflicts