diff --git a/packages/core/helper-plugin/lib/src/components/DateTimePicker/tests/__snapshots__/index.test.js.snap b/packages/core/helper-plugin/lib/src/components/DateTimePicker/tests/__snapshots__/index.test.js.snap
index 7ca80f2ccc..58197b0d42 100644
--- a/packages/core/helper-plugin/lib/src/components/DateTimePicker/tests/__snapshots__/index.test.js.snap
+++ b/packages/core/helper-plugin/lib/src/components/DateTimePicker/tests/__snapshots__/index.test.js.snap
@@ -181,6 +181,13 @@ exports[`DateTimePicker snapshots the component 1`] = `
   color: #32324d;
 }
 
+.c22 {
+  display: block;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
 .c18 {
   padding-left: 12px;
 }
@@ -262,23 +269,23 @@ exports[`DateTimePicker snapshots the component 1`] = `
   box-shadow: #4945ff 0px 0px 0px 2px;
 }
 
-.c22 {
+.c23 {
   background: transparent;
   border: none;
   position: relative;
   z-index: 1;
 }
 
-.c22 svg {
+.c23 svg {
   height: 0.6875rem;
   width: 0.6875rem;
 }
 
-.c22 svg path {
+.c23 svg path {
   fill: #666687;
 }
 
-.c23 {
+.c24 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -287,7 +294,7 @@ exports[`DateTimePicker snapshots the component 1`] = `
   border: none;
 }
 
-.c23 svg {
+.c24 svg {
   width: 0.375rem;
 }
 
@@ -322,7 +329,7 @@ exports[`DateTimePicker snapshots the component 1`] = `
   color: #32324d;
 }
 
-.c24 {
+.c25 {
   font-weight: 400;
   font-size: 0.75rem;
   line-height: 1.33;
@@ -473,7 +480,7 @@ exports[`DateTimePicker snapshots the component 1`] = `
                   class="c20"
                 >
                   <span
-                    class="c21"
+                    class="c21 c22"
                     id="timepicker-1-content"
                   >
                     10:00
@@ -485,7 +492,7 @@ exports[`DateTimePicker snapshots the component 1`] = `
               >
                 <button
                   aria-hidden="true"
-                  class="c18 c22 c23"
+                  class="c18 c23 c24"
                   tabindex="-1"
                   type="button"
                 >
@@ -511,7 +518,7 @@ exports[`DateTimePicker snapshots the component 1`] = `
       </div>
     </div>
     <p
-      class="c24"
+      class="c25"
       id="field-1-hint"
     >
       This is a super description
diff --git a/yarn.lock b/yarn.lock
index 1e9e21e12f..50c160703a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4602,33 +4602,19 @@
     resolve-from "^5.0.0"
     store2 "^2.12.0"
 
-<<<<<<< HEAD
 "@strapi/design-system@0.0.1-alpha.60":
   version "0.0.1-alpha.60"
   resolved "https://registry.yarnpkg.com/@strapi/design-system/-/design-system-0.0.1-alpha.60.tgz#85f2df1786d5b9860a7ea9dd078448957379f8d0"
   integrity sha512-D3UqW+/MKr+ulS9qeXPs3VXrG47pZlLQT4d4w5DJXGs+zrlzAQpRte6+7K9gFif7rFnhPDQrKKJLv3fmbd764Q==
-=======
-"@strapi/design-system@0.0.1-alpha.58":
-  version "0.0.1-alpha.58"
-  resolved "https://registry.yarnpkg.com/@strapi/design-system/-/design-system-0.0.1-alpha.58.tgz#06d0702060cf68f66ce1c9d6ecaa15c3d645eb77"
-  integrity sha512-J7Brq3gKe0D4Ig+hJskdv5fkEa6Z8WQdvO+CRu9pXEpZxj3at6t4Hn/3gpc0ZZ2seLfvpieH3tEFl0vAzDObtA==
->>>>>>> df7b15898 (Add DateTimePicker to helper plugin)
   dependencies:
     "@internationalized/number" "^3.0.2"
     compute-scroll-into-view "^1.0.17"
     prop-types "^15.7.2"
 
-<<<<<<< HEAD
 "@strapi/icons@0.0.1-alpha.60":
   version "0.0.1-alpha.60"
   resolved "https://registry.yarnpkg.com/@strapi/icons/-/icons-0.0.1-alpha.60.tgz#fe2794db4b55f80fbc734b43b3175b40656f2f8b"
   integrity sha512-QID8gjJF/GvZjg2g09i/C3T5koh87x9tyxHhctQQUybqvlrY779Jb+K1ASo34bZBE8bL+2RqDCT61xohmlYqGQ==
-=======
-"@strapi/icons@0.0.1-alpha.58":
-  version "0.0.1-alpha.58"
-  resolved "https://registry.yarnpkg.com/@strapi/icons/-/icons-0.0.1-alpha.58.tgz#5d621c6991b7cd51f0e0abf0a71d113896cc1972"
-  integrity sha512-HfmPRgS72VZjfwf09oCcDljMQzhVGVZNHWgWgGEDGNll1+sedPNzgY/NES8ArrOT4wChNoOVh/6RUHf/FyciZQ==
->>>>>>> df7b15898 (Add DateTimePicker to helper plugin)
 
 "@stylelint/postcss-css-in-js@^0.37.2":
   version "0.37.2"