Bug 980515 - Remove extraneous Conflicts element
Merge pull request #3680 from jwhonce/bug/980515

Merged by openshift-bot