Update composer.json

Remove conflict see discussion #4