diff --git a/.gitignore b/.gitignore
index 8952187..d4492e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-Implode-9-20091228.tar.bz2
+/implode-*.xo
diff --git a/sources b/sources
index f8ff6cc..35dbfbd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a6df0ceeab3f9853af95cf1f046e3a8f  implode-10.xo
+3a85d308c3738e31d13014818e147a19  implode-12.xo
diff --git a/sugar-implode-checkout.sh b/sugar-implode-checkout.sh
deleted file mode 100644
index de431a9..0000000
--- a/sugar-implode-checkout.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-# This script bsed on a template from the Fedora Project wiki
-# https://fedoraproject.org/wiki/Packaging/SugarActivityGuidelines#Sample_Checkout_Script
-# 
-# sugar-implode-checkout.sh
-VERSION=9
-NAME=Implode
-DATE=20091228
-#
-rm -rf $NAME-$VERSION
-git clone http://git.sugarlabs.org/git/implode/mainline.git $NAME-$VERSION-$DATE
-tar -cjvf $NAME-$VERSION-$DATE.tar.bz2 $NAME-$VERSION-$DATE --exclude=.git
-rm -rf $NAME-$VERSION-$DATE 
diff --git a/sugar-implode.spec b/sugar-implode.spec
index 528dcef..8647920 100644
--- a/sugar-implode.spec
+++ b/sugar-implode.spec
@@ -1,14 +1,21 @@
 %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
@@ -32,10 +39,17 @@ 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
@@ -48,6 +62,12 @@ 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