diff --git a/product-builder.spec b/product-builder.spec
index 1f23571..0a802c9 100644
--- a/product-builder.spec
+++ b/product-builder.spec
@@ -23,13 +23,8 @@ Url:            http://github.com/openSUSE/product-builder
 Name:           product-builder
 Conflicts:      kiwi
 Conflicts:      kiwi-instsource
-<<<<<<< ./product-builder.spec.mine
 Version:        1.0~pre.1503326741.f9c347a
 Release:        0
-=======
-Version:        1.0~pre.1503326741.f9c347a
-Release:        0
->>>>>>> ./product-builder.spec.r0ff8f0de04c2f43d9df4f23d686c1e9c
 Provides:       kiwi-schema = 6.2
 Source:         product-builder-%version.tar.xz