Resolves conflicts in composer.json, recovers old app/AppKernel.php