[ovirt-devel] conflicts in constants file