diff --git a/pyproject.toml b/pyproject.toml
index 297c131..ea04445 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,11 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "brukeropus"
-<<<<<<< HEAD
-version = "1.0.3"
-=======
 version = "1.0.4"
->>>>>>> origin/master
 authors = [
   { name="Josh Duran", email="josh.m.duran@gmail.com" },
 ]