diff --git a/dublast/__init__.py b/dublast/__init__.py
index 1469ebd..7293c51 100644
--- a/dublast/__init__.py
+++ b/dublast/__init__.py
@@ -15,11 +15,7 @@
     "name" : "DuBlast",
     "author" : "Nicolas 'Duduf' Dufresne",
     "blender" : (2, 81, 0),
-<<<<<<< HEAD
     "version" : (2,0,4),
-=======
-    "version" : (2,0,3),
->>>>>>> master
     "location" : "Properties > Output Properties > Playblast, 3D View > View menu,",
     "description" : "Create playblasts: Quickly render and play viewport animation.",
     "warning" : "",