Resolving conflicts in composer.json