diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d91e31dcc377e9ac642770a3e207872fca9973f0..b73c32eda6511ca3158315e8612e712339b3190a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -44,9 +44,6 @@ semgrep-sast:
 gitlab-advanced-sast:
   needs: []
 
-nodejs-scan-sast:
-  needs: []
-
 secret_detection:
   needs: []
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f44fd1954d4d419480740f0f03462ce11ce569ce..396fa7f9d130ec08e7999c12005f43aa14c73452 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# [106.0.0](https://gitlab.com/gitlab-org/gitlab-ui/compare/v105.7.0...v106.0.0) (2024-12-20)
+# [merge conflict 106.0.0](https://gitlab.com/gitlab-org/gitlab-ui/compare/v105.7.0...v106.0.0) (2024-12-20)
 
 
 ### Features
diff --git a/src/utils/is_slot_empty.js b/src/utils/is_slot_empty.js
index fee88968534a624469508be2f66f196258a13454..abe7eb26c4db0c0faaee9b88ac6d84575ad5f3c2 100644
--- a/src/utils/is_slot_empty.js
+++ b/src/utils/is_slot_empty.js
@@ -3,10 +3,6 @@ import Vue from 'vue';
 // Fragment will be available only in Vue.js 3
 const { Fragment, Comment, Text } = Vue;
 
-function callIfNeeded(fnOrResult, args) {
-  return fnOrResult instanceof Function ? fnOrResult(args) : fnOrResult;
-}
-
 export function isVnodeEmpty(vnode) {
   if (!vnode || (Comment && vnode.type === Comment)) {
     return true;
@@ -32,13 +28,7 @@ export function isVnodeEmpty(vnode) {
 }
 
 export function isSlotEmpty(vueInstance, slot, slotArgs) {
-  const isVue3 = Boolean(Fragment);
-
-  const slotContent = isVue3
-    ? // we need to check both $slots and $scopedSlots due to https://github.com/vuejs/core/issues/8869
-      // additionally, in @vue/compat $slot might be a function instead of array of vnodes (sigh)
-      callIfNeeded(vueInstance.$slots[slot] || vueInstance.$scopedSlots[slot], slotArgs)
-    : vueInstance.$scopedSlots[slot]?.(slotArgs);
+  const slotContent = vueInstance.$scopedSlots[slot]?.(slotArgs);
 
   // eslint-disable-next-line unicorn/no-array-callback-reference
   return isVnodeEmpty(slotContent);