diff --git a/sugar-implode.spec b/sugar-implode.spec
index 8647920..dcc9733 100644
--- a/sugar-implode.spec
+++ b/sugar-implode.spec
@@ -1,21 +1,13 @@
 %global shortname implode
 
 Name:           sugar-%{shortname}
-<<<<<<< HEAD
-Version:        10
-=======
 Version:        12
->>>>>>> master
 Release:        1%{?dist}
 Summary:        Implode for Sugar
 Group:          Sugar/Activities
 License:        GPLv2+
 URL:            http://wiki.sugarlabs.org/go/Activities/Implode
 Source0:        http://download.sugarlabs.org/activities/4086/%{shortname}-%{version}.xo
-<<<<<<< HEAD
-Source1:        sugar-implode-checkout.sh
-=======
->>>>>>> master
 BuildArch:      noarch
 BuildRequires:  gettext
 BuildRequires:  python
@@ -39,17 +31,10 @@ always a sequence of removals that clears the board.
 %setup -q -n Implode.activity
 
 %build
-<<<<<<< HEAD
-%{__python} setup.py build
-
-%install
-%{__python} setup.py install --prefix=%{buildroot}/%{_prefix}
-=======
 python ./setup.py build
 
 %install
 python ./setup.py install --prefix=%{buildroot}/%{_prefix}
->>>>>>> master
 #executables
 find  %{buildroot}%{sugaractivitydir}Implode.activity/*.py -type f | xargs chmod a+x
 for file in %{buildroot}%{sugaractivitydir}Implode.activity/{board,boardgen,color,gridwidget,implodeactivity,implodegame,setup}.py; do
@@ -62,12 +47,9 @@ done
 %{sugaractivitydir}/Implode.activity/
 
 %changelog
-<<<<<<< HEAD
-=======
 * Sat May 19 2012 Peter Robinson <pbrobinson@fedoraproject.org> - 12-1
 - Release 12
 
->>>>>>> master
 * Thu Mar  8 2012 Tom Callaway <spot@fedoraproject.org> - 10-1
 - update to v10