Fixed remote composer.json
Merge and fix conflicts.