diff --git a/AUTHORS b/AUTHORS
index a41428f4f5..757ef481e9 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -198,11 +198,8 @@ answer newbie questions, and generally made Django that much better:
     Waylan Limberg <waylan@gmail.com>
     limodou
     Philip Lindborg <philip.lindborg@gmail.com>
-<<<<<<< .working
     Simon Litchfield <simon@quo.com.au>
-=======
     msaelices <msaelices@gmail.com>
->>>>>>> .merge-right.r6370
     Matt McClanahan <http://mmcc.cx/>
     Martin Maney <http://www.chipy.org/Martin_Maney>
     Petr Marhoun <petr.marhoun@gmail.com>