diff --git a/.gitignore b/.gitignore
index ec61d2e..57517f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,8 @@
 /argcomplete-0.7.0.tar.gz
 /argcomplete-0.7.1.tar.gz
 /argcomplete-0.8.0.tar.gz
+<<<<<<< HEAD
 /argcomplete-0.8.4.tar.gz
+=======
+/argcomplete-0.8.1.tar.gz
+>>>>>>> 55515db9d1c272c3f84d3370e50da16fcb92b593
diff --git a/python-argcomplete.spec b/python-argcomplete.spec
index 5884580..e13606d 100644
--- a/python-argcomplete.spec
+++ b/python-argcomplete.spec
@@ -3,7 +3,11 @@
 
 Summary:	Bash tab completion for argparse
 Name:		python-argcomplete
+<<<<<<< HEAD
 Version:	0.8.4
+=======
+Version:	0.8.1
+>>>>>>> 55515db9d1c272c3f84d3370e50da16fcb92b593
 Release:	1%{?dist}
 License:	ASL 2.0
 Group:		Development/Libraries
@@ -51,8 +55,16 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+<<<<<<< HEAD
 * Sun Dec 14 2014 - Dale Macartney <dbmacartney@fedoraproject.org> 0.8.4-1
 - Updating package to 0.8.4
+=======
+* Fri Sep 12 2014 - Steve Traylen <steve.traylen@cern.ch> 0.8.1-1
+- Updating package to 0.8.1
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+>>>>>>> 55515db9d1c272c3f84d3370e50da16fcb92b593
 
 * Mon Apr 14 2014 - Dale Macartney <dbmacartney@fedoraproject.org> 0.8.0-1
 - Updating package to 0.8.0
diff --git a/sources b/sources
index 1607540..2b48e96 100644
--- a/sources
+++ b/sources
@@ -1 +1,5 @@
+<<<<<<< HEAD
 718ec5ba1b9f84b7d556c9f30b92b606  argcomplete-0.8.4.tar.gz
+=======
+f072c20533b103b1de8438396f45ffba  argcomplete-0.8.1.tar.gz
+>>>>>>> 55515db9d1c272c3f84d3370e50da16fcb92b593