diff --git a/Readme.md b/Readme.md
index 0896fa5..bd55409 100644
--- a/Readme.md
+++ b/Readme.md
@@ -164,10 +164,13 @@ destyle.css resets buttons completely to make them usable as any other element <
 
 ## Changelog
 
+<<<<<<< HEAD
 ### **v4.0.1.** 2024-01-21
 
 - Add `min-width: 0` to allow proper text wrappig in flex containers.
 
+=======
+>>>>>>> 489e813950f67427c5e57f6c90d8c29ad07c9390
 ### **v4.0.0.** 2022-11-07
 
 - Add `appearance: none` to checkboxes and radio buttons.