diff --git a/.gitignore b/.gitignore
index 21bedf6..b5c10f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,10 +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
 /guitarix2-0.20.2.tar.bz2
 /guitarix2-0.21.0.tar.bz2
 /guitarix-0.21.0-glib.patch
diff --git a/guitarix.spec b/guitarix.spec
index bff848a..f534478 100644
--- a/guitarix.spec
+++ b/guitarix.spec
@@ -4,7 +4,7 @@
 %global altname2 guitarix2
 
 Name:           guitarix
-Version:        0.22.2
+Version:        0.22.3
 Release:        1%{?dist}
 Summary:        Mono amplifier to JACK
 Group:          Applications/Multimedia
@@ -113,8 +113,11 @@ chmod 644 %{buildroot}/%{_datadir}/%{altname}/skins/*
 %{_datadir}/ladspa
 
 %changelog
+* Tue May 15 2012 Brendan Jones <brendan.jones.it@gmail.com> - 0.22.3-1
+- Update to upstream 0.22.3
+
 * Thu May 03 2012 Brendan Jones <brendan.jones.it@gmail.com> - 0.22.2-1
-- Update to upstream 0.22.0
+- Update to upstream 0.22.2
 
 * Tue Feb 28 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.21.0-2
 - Rebuilt for c++ ABI breakage
diff --git a/guitarix2-0.22.2.tar.bz2 b/guitarix2-0.22.2.tar.bz2
deleted file mode 100644
index fb5d77e..0000000
Binary files a/guitarix2-0.22.2.tar.bz2 and /dev/null differ
diff --git a/guitarix2-0.22.3.tar.bz2 b/guitarix2-0.22.3.tar.bz2
new file mode 100644
index 0000000..d0f06cf
Binary files /dev/null and b/guitarix2-0.22.3.tar.bz2 differ