fix inline code with ProfilePicture

src/pages/Profile/ProfilePage.module.css

@@ -7,12 +7,6 @@
 }
 
 .profileboard {
-<<<<<<< HEAD
-  width: 100%;
-  padding: 16px;
-  border-radius: 20px;
-  box-sizing: border-box;
-=======
     width: 100%;
     padding: 16px;
     border-radius: 20px;
@@ -23,7 +17,6 @@
     display: flex;
     justify-content: center;
     align-items: center;
->>>>>>> dev
 }
 
 .contentWrapper {
@@ -91,14 +84,6 @@
   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;
@@ -126,7 +111,6 @@
     height: 22px;
     display: block;
     margin: 0;
->>>>>>> dev
 }
 
 /* Conteneur des informations principales */