resolved merge conflict

Author: iamshobhraj

Diff for: packages/kolibri/composables/__mocks__/useUser.js

@@ -30,19 +30,12 @@
  * useUser.mockImplementation(() => useUserMock())
  * ```
  */
-<<<<<<< HEAD
  import { ref, computed } from 'vue';
  import { UserKinds } from 'kolibri/constants';
  import { jest } from '@jest/globals';
  import { setServerTime } from 'kolibri/utils/serverClock';
 
 
-=======
-import { ref, computed } from '@vue/composition-api';
-import { UserKinds } from 'kolibri/constants';
-import { jest } from '@jest/globals'; // Ensure jest is imported for mocking functions
-
->>>>>>> ec7851aa405df9e32f819ad44cd488128408854b
 const MOCK_DEFAULT_SESSION = {
   app_context: false,
   can_manage_content: false,