Fix broken composer.json

Accidentally left some merge-conflict output in the composer.json.
Whoops!