merge conflict in the cpe descriptor