diff --git a/en/projects/projects.sgml b/en/projects/projects.sgml
index f8bd804316..c44301f0ae 100644
--- a/en/projects/projects.sgml
+++ b/en/projects/projects.sgml
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/en/projects/projects.sgml,v 1.127 2002/07/03 20:29:39 scop Exp $">
+<!ENTITY date "$FreeBSD: www/en/projects/projects.sgml,v 1.128 2002/07/03 23:05:26 jim Exp $">
 <!ENTITY title "FreeBSD Development Projects">
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 ]>
@@ -25,11 +25,7 @@ reports page</a>.</p>
 
 <ul>
   <li><a href="#documentation">Documentation</a></li>
-<<<<<<< projects.sgml
-  <li><a href="../advocacy/advocacy.html">Advocacy</a></li>
-=======
   <li><a href="../advocacy/index.html">Advocacy</a></li>
->>>>>>> 1.126
   <li><a href="#applications">Applications</a></li>
   <li><a href="#networking">Networking</a></li>
   <li><a href="#filesystem">Filesystem</a></li>
