diff --git a/PHP Markdown Extra Readme.text b/PHP Markdown Extra Readme.text
index d25e887..34964ca 100644
--- a/PHP Markdown Extra Readme.text	
+++ b/PHP Markdown Extra Readme.text	
@@ -1,11 +1,7 @@
 PHP Markdown Extra
 ==================
 
-<<<<<<< HEAD:PHP Markdown Extra Readme.text
-Version 1.2.1 - Tue 27 May 2008
-=======
-Version 1.0.1m - Sat 21 Jun 2008
->>>>>>> master:PHP Markdown Readme.text
+Version 1.2.2 - Sat 21 Jun 2008
 
 by Michel Fortin
 <http://www.michelf.com/>