diff --git a/mix.exs b/mix.exs
index f14a8700..c4420b41 100644
--- a/mix.exs
+++ b/mix.exs
@@ -1,11 +1,7 @@
 defmodule Legendary.Mixfile do
   use Mix.Project
 
-<<<<<<< HEAD
-  @version "3.0.0"
-=======
   @version "4.3.1"
->>>>>>> 52db6ba1e087e55e1f3863277bfbaa3aa060af00
 
   def project do
     [