diff --git a/Cargo.toml b/Cargo.toml
index e3aabb2..76525fd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,10 +1,6 @@
 [package]
 name = "leptos_toaster"
-<<<<<<< HEAD
-version = "0.1.3"
-=======
 version = "0.1.5"
->>>>>>> 006ce8bc35a1b11e37266a4fce2c8f19310cb1f4
 edition = "2021"
 repository = "https://github.com/SorenHolstHansen/leptos_toaster"
 license = "MIT"