composer.json target dir remove
conflict merge