diff --git a/docs/guide/signals.rst b/docs/guide/signals.rst
index 4b654e66..f60e4d78 100644
--- a/docs/guide/signals.rst
+++ b/docs/guide/signals.rst
@@ -9,7 +9,11 @@ Signal support is provided by the excellent `blinker`_ library and
 will gracefully fall back if it is not available.
 
 
+<<<<<<< HEAD
 The following document signals exist in MongoEngine and are pretty self explanatory:
+=======
+The following document signals exist in MongoEngine and are pretty self-explanatory:
+>>>>>>> master
 
   * `mongoengine.signals.pre_init`
   * `mongoengine.signals.post_init`
diff --git a/python-mongoengine.spec b/python-mongoengine.spec
index 3609a54e..cc7b043c 100644
--- a/python-mongoengine.spec
+++ b/python-mongoengine.spec
@@ -22,6 +22,7 @@ Requires:       pymongo
 Requires:       python-blinker
 Requires:       python-imaging
 
+
 %description
 MongoEngine is an ORM-like layer on top of PyMongo.
 
@@ -53,9 +54,7 @@ rm -rf $RPM_BUILD_ROOT
 * Thu Oct 27 2011 Pau Aliagas <linuxnow@gmail.com> 0.5.3-1
 - Update to latest dev version
 * Add PIL dependency for ImageField
-
 * Wed Oct 12 2011 Pau Aliagas <linuxnow@gmail.com> 0.5.2-1
 - Update version
-
 * Fri Sep 23 2011 Pau Aliagas <linuxnow@gmail.com> 0.5.0-1
 - Initial version