readded conflict, since https://github.com/composer/composer/pull/1922 was merged