I think, the conflict only occurs when you build different versions of a kmp for the same kernel-version (3.16.7-21-desktop in this case). So this will be working again, after the next kernel-update goes out and we rebuild the kmp for it. Not sure how to best solve it.