kernel/modules: remove merge conflicts leftovers