composer and initial doctrine mappings
resolved merge conflict
ignore vendor and composer.lock
stuff
merge conflict
phpunit installed