Solved merge conflict.

src/constants/Categories.ts

@@ -1,5 +1,5 @@
 // Highlighted sidebar items
-export const NEW = ['Target Cursor', 'Ripple Grid', 'Magic Bento', 'Galaxy', 'Glass Surface'];
+export const NEW = ['Target Cursor', 'Ripple Grid', 'Magic Bento', 'Galaxy', 'Text Type', 'Glass Surface'];
 export const UPDATED = [];
 
 // Used for main sidebar navigation
@@ -26,7 +26,8 @@ export const CATEGORIES = [
       'Scroll Reveal',
       'Rotating Text',
       'Glitch Text',
-      'Scroll Velocity'
+      'Scroll Velocity',
+      'Text Type'
     ]
   },
   {

src/constants/Components.ts

@@ -42,6 +42,7 @@ const textAnimations = {
   'rotating-text': () => import("../demo/TextAnimations/RotatingTextDemo.vue"),
   'glitch-text': () => import("../demo/TextAnimations/GlitchTextDemo.vue"),
   'scroll-velocity': () => import("../demo/TextAnimations/ScrollVelocityDemo.vue"),
+  'text-type': () => import("../demo/TextAnimations/TextTypeDemo.vue"),
 };
 
 const components = {

src/constants/code/TextAnimations/textTypeCode.ts

@@ -0,0 +1,19 @@
+import code from '@/content/TextAnimations/TextType/TextType.vue?raw';
+import { createCodeObject } from '@/types/code';
+
+export const textType = createCodeObject(code, 'TextAnimations/TextType', {
+  installation: `npm install gsap`,
+  usage: `<template>
+ <TextType 
+  :text="['Text typing effect', 'for your websites', 'Happy coding!']"
+  :typingSpeed="75"
+  :pauseDuration="1500"
+  :showCursor="true"
+  cursorCharacter="|"
+/>
+</template>
+
+<script setup lang="ts">
+  import TextType from "./TextType.vue";
+</script>`
+});