Fix conflicts

components/simulation-menu/legende/Legende.jsx

@@ -19,7 +19,7 @@ function Legende({ montrerPLF }) {
             </a>
           </span>
         )}
-        <span className={styles.amendment}>Mon amendment</span>
+        <span className={styles.reform}>Mon amendment</span>
       </div>
     </div>
   );

components/simulation-menu/legende/Legende.module.scss

 @import 'styles/variables';
 
-.legend, .initial, .amendment, .plf {
+.legend, .initial, .reform, .plf {
   font-family: $default-font-family;
   font-size: 12px;
 }
@@ -34,9 +34,9 @@
 }
 
 
-.amendment {
+.reform {
   font-weight: bold;
   color: black;
-  background-color: $amendment-bg-color;
+  background-color: $reform-bg-color;
   padding: 0.1rem;
 }
\ No newline at end of file