FIX composer.json
Merge