diff --git a/components/CopyField.jsx b/components/CopyField.jsx
index ebb1e02..b4b29e1 100644
--- a/components/CopyField.jsx
+++ b/components/CopyField.jsx
@@ -21,6 +21,7 @@ const CopyField = (props) => {
     new ClipboardJS('.btn');
   }
 
+  
 
   return (
     <div className="input-group my-4 ">
diff --git a/components/Error.jsx b/components/Error.jsx
index dc855db..9f30dfd 100644
--- a/components/Error.jsx
+++ b/components/Error.jsx
@@ -5,11 +5,11 @@ import { useTranslation } from "next-i18next";
 const Error = (props) => {
   const { t } = useTranslation();
   return (
-    <Container>
+    <Container className="full-height-container">
       <Row>
         <Link href="/">
           <a className="d-block ml-auto mr-auto mb-4">
-            <img src="/logos/logo-line-white.svg" alt="logo" height="128" />
+            <img src="/logos/logo.svg" alt="logo" height="128" />
           </a>
         </Link>
       </Row>
@@ -19,15 +19,15 @@ const Error = (props) => {
         </Col>
       </Row>
       <Row className="mt-4">
-        <Col className="text-right mr-4">
+        <Col className="my-3" sm="6">
           <Link href="/">
-            <a className="btn btn-secondary">{t("common.backHomepage")}</a>
+            <a className="btn btn-secondary m-auto">{t("common.backHomepage")}</a>
           </Link>
         </Col>
-        <Col className="text-left ml-4">
+        <Col className="my-3" sm="6">
           <a
             href="mailto:app@mieuxvoter.fr?subject=[HELP]"
-            className="btn btn-success"
+            className="btn btn-success m-auto"
           >
             {t("resource.help")}
           </a>
diff --git a/components/form/CandidateField.jsx b/components/form/CandidateField.jsx
index a642b52..91a3832 100644
--- a/components/form/CandidateField.jsx
+++ b/components/form/CandidateField.jsx
@@ -42,34 +42,6 @@ const CandidateField = ({avatar, label, description, candIndex, onDelete, onAdd,
   }
   useEffect(() => {
     setClassName("candidateButton " + (selected ? "candidateAdded" : ""))
-<<<<<<< HEAD
-}, [selected] );
-useEffect(() => {
-  setPlusIcon("mr-2 cursorPointer " + (selected ? "trashIcon" : ""))
-}, [selected] );
-useEffect(() => {
-  setTrashIcon("trashIcon " + (selected ? "displayTrash" : ""))
-}, [selected] );
-
-const addFunction = () => {
-  addCandidate();
-  setSelectedState(!selected); 
-};
-const deleteFunction = () => {
-  onDelete();
-  toggle();
-}
-
-    const [image, setImage] = useState(null);
-    const [createObjectURL, setCreateObjectURL] = useState(null);
-    const uploadToClient = (event) => {
-        if (event.target.files && event.target.files[0]) {
-            const i = event.target.files[0];
-            setImage(i);
-            setCreateObjectURL(URL.createObjectURL(i));
-        }
-    };
-=======
   }, [selected]);
   useEffect(() => {
     setPlusIcon("mr-2 cursorPointer " + (selected ? "trashIcon" : ""))
@@ -82,6 +54,10 @@ const deleteFunction = () => {
     addCandidate();
     setSelectedState(!selected);
   }
+  const removeCandidate = () => {
+    onDelete();
+    toggle();
+  }
 
 
 
@@ -98,7 +74,6 @@ const deleteFunction = () => {
 
 
 
->>>>>>> 102b62636454308245aa839e42a8387359101d1d
 
     }
   };
@@ -182,13 +157,8 @@ const deleteFunction = () => {
                 autoFocus
               />
               <Row className="removeAddButtons">
-<<<<<<< HEAD
-                
-                <ButtonWithConfirm className="removeButton" label={label} onDelete={deleteFunction}/>
-=======
 
-                <ButtonWithConfirm className="removeButton" label={label} onDelete={onDelete, toggle} />
->>>>>>> 102b62636454308245aa839e42a8387359101d1d
+                <ButtonWithConfirm className="removeButton" label={label} onDelete={removeCandidate} />
                 <Button className="addButton" label={label} onClick={addFunction}>
                   <FontAwesomeIcon icon={faPlus} />
                   <span>Ajouter</span>
diff --git a/package-lock.json b/package-lock.json
index ad8107c..db39fcf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9710,36 +9710,6 @@
         "xtend": "~4.0.1"
       }
     },
-<<<<<<< HEAD
-    "node_modules/through2/node_modules/readable-stream": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
-      }
-    },
-    "node_modules/through2/node_modules/string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "dependencies": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
-    "node_modules/tiny-emitter": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
-      "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="
-    },
-=======
->>>>>>> 102b62636454308245aa839e42a8387359101d1d
     "node_modules/tinycolor2": {
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.4.2.tgz",
diff --git a/pages/index.jsx b/pages/index.jsx
index 1c5c9de..0758adc 100644
--- a/pages/index.jsx
+++ b/pages/index.jsx
@@ -39,7 +39,7 @@ const Home = () => {
               <Row>
                 <h2>Organisez un vote avec le Jugement Majoritaire</h2>
               </Row>
-              <Row>
+              <Row className="justify-content-end">
                 <Input
                   placeholder={t("resource.writeQuestion")}
                   autoFocus
@@ -48,23 +48,13 @@ const Home = () => {
                   name="title"
                   value={title ? title : ""}
                   onChange={(e) => setTitle(e.target.value)}
-                  maxLength="100"
+                  maxLength="250"
                 />
                 
-                <p className="pt-0 mt-0 mr-0 maxLength">100</p>
+                <p className="pt-0 mt-0 mr-0 maxLength">250</p>
                 
               </Row>
               <Row>
-<<<<<<< HEAD
-              <Link href={{ pathname: "/new/", query: { title: title } }}>
-                <Button
-                  type="submit"
-                  className="btn btn-block btn-secondary mt-2"
-                >
-                  {t("resource.start")}
-                  <img src="/arrow-white.svg" className="m-2" />
-                </Button>
-=======
                 <Link href={{pathname: "/new/", query: {title: title}}}>
                   <Button
                     type="submit"
@@ -73,7 +63,6 @@ const Home = () => {
                     {t("resource.start")}
                     <img src="/arrow-white.svg" className="mr-2" />
                   </Button>
->>>>>>> 102b62636454308245aa839e42a8387359101d1d
                 </Link>
               </Row>
               <Row className="noAds">
diff --git a/styles/scss/_homePage.scss b/styles/scss/_homePage.scss
index 34d1bf8..aefd6c7 100644
--- a/styles/scss/_homePage.scss
+++ b/styles/scss/_homePage.scss
@@ -51,9 +51,7 @@
     border-radius: 0%;
     color: #FFFFFF;
   }
-  .sectionOneHomeInput::after {
-    content: '100';
-  }
+
   .sectionOneHomeInput::placeholder {
     color: #C3BFD8;
   }