resolve conflicts btw ts interface

src/pages/Profile/ProfilePage.module.css

@@ -7,11 +7,25 @@
 }
 
 .profileboard {
+<<<<<<< HEAD
   width: 100%;
   padding: 16px;
   border-radius: 20px;
   box-sizing: border-box;
+=======
+    width: 100%;
+    padding: 16px;
+    border-radius: 20px;
+    box-sizing: border-box;
 }
+
+.settingImage {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+>>>>>>> dev
+}
+
 .contentWrapper {
   display: flex;
   flex-direction: column;
@@ -77,12 +91,42 @@
   margin-bottom: 16px;
 }
 
+<<<<<<< HEAD
 .headerProfile h2 {
   font-size: 1.6rem;
   margin: 0;
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
+=======
+.description h2 {
+    font-size: 1.6rem;
+    margin-bottom: 10px;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+.description button {
+    width: 44px;
+    height: 44px;
+    min-width: 44px;
+    min-height: 44px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding: 0;
+    background: transparent;
+    border: none;
+    cursor: pointer;
+}
+
+.modifyIcon {
+    width: 22px;
+    height: 22px;
+    display: block;
+    margin: 0;
+>>>>>>> dev
 }
 
 /* Conteneur des informations principales */