diff --git a/.gitignore b/.gitignore
index 04fb439..94e2d54 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,7 @@ guitarix-0.11.0.tar.bz2
 /guitarix-0.11.1.tar.bz2
 /guitarix2-0.16.0.tar.bz2
 /guitarix2-0.17.0.tar.bz2
+<<<<<<< HEAD
 /guitarix2-0.19.0-svn1245.tar.bz2
+=======
+>>>>>>> eb2f8801040969d8acb50eb969b246f19feab35b
diff --git a/guitarix.spec b/guitarix.spec
index 82631a6..aeac4da 100644
--- a/guitarix.spec
+++ b/guitarix.spec
@@ -2,6 +2,7 @@
 # project name remains guitarix however
 %global altname gx_head
 %global altname2 guitarix2
+<<<<<<< HEAD
 %global svnrevision svn1245
 
 Name:           guitarix
@@ -10,6 +11,10 @@ Release:        1.0.%{svnrevision}%{?dist}
 =======
 
 Name:           guitarix
+=======
+
+Name:           guitarix
+>>>>>>> eb2f8801040969d8acb50eb969b246f19feab35b
 Version:        0.17.0
 Release:        2%{?dist}
 Summary:        Mono amplifier to JACK
@@ -130,9 +135,12 @@ rm -rf %{buildroot}
 %{_libdir}/ladspa/*.so
 
 %changelog
+<<<<<<< HEAD
 * Sun Oct 30 2011 Brendan Jones <brendan.jones.it@gmail.com> - 0.19.0-1.0.svn1245
 - Grab source from svn to rebuild against zita-convolver-3
 
+=======
+>>>>>>> eb2f8801040969d8acb50eb969b246f19feab35b
 * Fri Jul 15 2011 Brendan Jones <brendan.jones.it@gmail.com> - 0.17.0-2
 - Correct changelog to prevent rpmlint warnings
 
diff --git a/sources b/sources
index 56f490f..70659e1 100644
--- a/sources
+++ b/sources
@@ -1 +1,5 @@
+<<<<<<< HEAD
 22e1bc92e0804467b22f28b16ca57b50  guitarix2-0.19.0-svn1245.tar.bz2
+=======
+e915d5f2f4fcdda0f9614678d04d9bd1  guitarix2-0.17.0.tar.bz2
+>>>>>>> eb2f8801040969d8acb50eb969b246f19feab35b