diff --git a/.env b/.env
index 1b7a3f6..2d17674 100644
--- a/.env
+++ b/.env
@@ -1,7 +1,2 @@
-<<<<<<< HEAD
 version=1.5.01
 VERSION=1.5.01
-=======
-version=1.4.08
-VERSION=1.4.08
->>>>>>> d7116b8cf364ff8d360beb8e865a9485628d28b2