Move phpunit.xml To Root Directory
Resolve Conflicts