diff --git a/packages/wyatt_ui_kit/lib/src/components/cards/widgets/card_wrapper.dart b/packages/wyatt_ui_kit/lib/src/components/cards/widgets/card_wrapper.dart
index 736c0387..46a72582 100644
--- a/packages/wyatt_ui_kit/lib/src/components/cards/widgets/card_wrapper.dart
+++ b/packages/wyatt_ui_kit/lib/src/components/cards/widgets/card_wrapper.dart
@@ -112,7 +112,8 @@ class _CardWrapperState extends State<CardWrapper> {
           extensionCardColor.backgroundColors != null &&
           extensionCardColor.backgroundColors!.isGradient) {
         return LinearGradient(
-            colors: extensionCardColor.backgroundColors!.colors,);
+          colors: extensionCardColor.backgroundColors!.colors,
+        );
       }
     }
     return null;
@@ -151,15 +152,9 @@ class _CardWrapperState extends State<CardWrapper> {
       final extensionCardColor =
           Theme.of(context).extension<CardThemeExtension>();
       if (extensionCardColor != null &&
-<<<<<<< HEAD
           extensionCardColor.borderColors != null) {
         if (extensionCardColor.borderColors!.isGradient) {
-          return GradientBoxBorder(
-=======
-          extensionCardColor.borderColor != null) {
-        if (extensionCardColor.borderColor!.length >= 2) {
           return CustomGradientBoxBorder(
->>>>>>> 548df1c (feat(ui_kit): implemement text inputs (#138))
             gradient: LinearGradient(
               colors: extensionCardColor.borderColors!.colors,
             ),