--- docs/compiler_faq.pod	2004-05-11 13:47:27.000000000 -0500
+++ docs/compiler_faq.pod	2004-05-11 16:24:44.000000000 -0500
@@ -5,27 +5,10 @@
 
 docs/compiler_faq.pod - Parrot FAQ for compiler writers
 
-<<<<<<< compiler_faq.pod
-=head1 Subroutines
-=======
 =head1 General Questions
->>>>>>> 1.3
 
-<<<<<<< compiler_faq.pod
-=head2 How do I generate a sub call in PIR?
-=======
 =head2 Which C compilers can I use with Parrot?
->>>>>>> 1.3
 
-<<<<<<< compiler_faq.pod
-=head2 How do I generate a method call in PIR?
-
-=head2 How do I generate a sub call with a variable-length parameter list in PIR?
-
-=head2 How to I retrieve the contents of a variable-length parameter list being passed to me?
-
-=head1 Variables
-=======
 Whoa, there--you're looking at the wrong FAQ.  This document is for people
 writing compilers that target Parrot.
 
@@ -45,7 +28,6 @@
 =head2 How to I retrieve the contents of a variable-length parameter list being passed to me?
 
 =head1 Variables
->>>>>>> 1.3
 
 =head2 How do I fetch a variable from the global namespace?
 
@@ -65,7 +47,7 @@
 
 =over 4
 
-=item Revision 0.2 - 10 May 2004
+=item 2004-05-11
 
 =back