composer.json generated again
confilct is fixed