adding composer globally with phpunit
merge conflict fix