Update composer.json

Add `conflict` part as `doctrine/common` <2.4 has cache in it.
Merge pull request #1 from stloyd/patch-1

Update composer.json