diff --git a/renderdoc.spec b/renderdoc.spec
index afc7c1f..bec32f2 100644
--- a/renderdoc.spec
+++ b/renderdoc.spec
@@ -1,12 +1,7 @@
 %global vswig   modified-7
 Name:           renderdoc
-<<<<<<< HEAD
-Version:        1.4
-Release:        4%{?dist}
-=======
 Version:        1.5
 Release:        1%{?dist}
->>>>>>> Update to renderdoc 1.5
 Summary:        A stand-alone graphics debugging tool
 
 License:        MIT