diff --git a/TODO b/TODO
index c589c430e5..f8fc2cf24a 100644
--- a/TODO
+++ b/TODO
@@ -1,18 +1,5 @@
 HIGH-PRIORITY (must be done to support SETI@home)
 
-- File retry policies (Eric?)
-    can't download file: when to give up? how to retry?
-        exponential backoff
-    can't upload file: when to give up/retry?
-
-- scheduler RPC retry
-    can't connect to sched server
-    error return from sched server
-    Done - David
-
-- make scheduling server use fast CGI
-    Done - Michael
-
 - proxy support
     HTTP, Socks
     Look at other open source code
@@ -158,6 +145,17 @@ LOW-PRIORITY
 --------------------------
 DONE (may need test)  Please document these!
 
+- File retry policies
+    can't download file: when to give up? how to retry?
+        exponential backoff
+    can't upload file: when to give up/retry?
+    To be tested - Eric
+
+- scheduler RPC retry
+    can't connect to sched server
+    error return from sched server
+    To be tested - David
+
 - Code-signing
     To be tested - David
 
diff --git a/doc/index.html b/doc/index.html
index 461d31857b..a9c6dbf325 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -9,25 +9,6 @@ distributed.net and SETI@home.
 <ul>
 <li> <a href="intro.html">Introduction</a>
 </ul>
-<<<<<<< index.html
-
-<h3>Participating in BOINC projects</h3>
-<font size=-1>
-<dd> How to donate your unused computing power
-to projects that use BOINC.
-</font>
-<ul>
-<li> <a href="account.html">Participant accounts</a> 
-<li> <a href="prefs.html">Preferences</a> 
-<li> <a href="startup.html">Participant startup</a> 
-</ul>
-
-<h3>Designing a distributed computation with BOINC</h3>
-<font size=-1>
-<dd> Read this if you are considering using distributed computing
-for your a compute- or storage-intensive application.
-</font>
-=======
 
 <h3>Participating in BOINC projects</h3>
 <font size=-1>
@@ -45,7 +26,6 @@ to projects that use BOINC.
 <dd> Read this if you are considering using distributed computing
 for your a compute- or storage-intensive application.
 </font>
->>>>>>> 1.13
 <ul>
 <li><a href=parallelize.html>Is your application suitable?</a>
 <li><a href=files.html>Compute model: files and file references</a>
@@ -58,15 +38,6 @@ for your a compute- or storage-intensive application.
 <li><a href=file_access.html>Compute model: remote file access</a>
 <li><a href=validation.html>Accounting and result validation</a>
 <li><a href=back_end.html>Back end examples</a>
-<<<<<<< index.html
-
-</ul>
-<h3>Developing a BOINC application</h3>
-<font size=-1>
-<dd> Read this to learn how to port an application to BOINC.
-</font>
-<ul>
-=======
 </ul>
 
 <h3>Developing a BOINC application</h3>
@@ -74,7 +45,6 @@ for your a compute- or storage-intensive application.
 <dd> Read this to learn how to port an application to BOINC.
 </font>
 <ul>
->>>>>>> 1.13
 <li><a href=api.html>The API</a>
 <li><a href=graphics.html>The graphics API</a>
 <li><a href=dev.html>Application development</a></ul>
@@ -84,15 +54,6 @@ for your a compute- or storage-intensive application.
 <dd> Read this to learn how to create a BOINC project.
 </font>
 <ul>
-<<<<<<< index.html
-<li><a href=project.html>Projects</a>
-<li> <a href="master_url.html">The master URL</a> 
-<li> <a href=road_map.html>Road map of the BOINC software</a>
-<li> <a href="install.html">Installing a BOINC server</a> 
-<li> <a href="project_startup.html">Project startup checklist</a> 
-<li> <a href="sched_server.html">The BOINC scheduling server</a> 
-<li> <a href="test.html">Test applications and scripts</a> 
-=======
 <li><a href=project.html>Projects</a>
 <li> <a href="master_url.html">The master URL</a>
 <li> <a href=road_map.html>Road map of the BOINC software</a>
@@ -100,21 +61,8 @@ for your a compute- or storage-intensive application.
 <li> <a href="project_startup.html">Project startup checklist</a>
 <li> <a href="sched_server.html">The BOINC scheduling server</a>
 <li> <a href="test.html">Test applications and scripts</a>
->>>>>>> 1.13
 </ul>
 
-<<<<<<< index.html
-<h3>Developing and operating the back end of a BOINC project</h3>
-<font size=-1>
-<dd> Read this to learn how to feed work into a BOINC system,
-and collect the results.
-</font>
-<ul>
-<li> <a href="tools_security.html">Operational tools: security</a> 
-<li> <a href="tools_other.html">Operational tools: applications and versions</a> 
-<li> <a href="tools_work.html">Operational tools: work and results</a> 
-<li> <a href="security.html">Security</a> 
-=======
 <h3>Developing and operating the back end of a BOINC project</h3>
 <font size=-1>
 <dd> Read this to learn how to feed work into a BOINC system,
@@ -125,31 +73,8 @@ and collect the results.
 <li> <a href="tools_other.html">Operational tools: applications and versions</a>
 <li> <a href="tools_work.html">Operational tools: work and results</a>
 <li> <a href="security.html">Security</a>
->>>>>>> 1.13
 </ul>
 
-<<<<<<< index.html
-<h3>Implementation and debugging of BOINC</h3>
-<font size=-1>
-<dd> Read this to learn how to debug and enhance the BOINC software.
-</font>
-<ul>
-<li> <a href="database.html">The BOINC database</a> 
-<li> <a href="client_files.html">Core Client: file structure</a> 
-<li> <a href="client_fsm.html">Core Client: FSM structure</a> 
-<li> <a href="client_data.html">Core Client: data structures</a> 
-<li> <a href="client_logic.html">Core client: logic</a> 
-<li> <a href="client_debug.html">Core client: debugging</a>
-<li> <a href="protocol.html">The BOINC client/server protocol</a> 
-<li> <a href="sched_policy.html">Scheduling server: policy</a> 
-<li> <a href="sched_impl.html">Scheduling server: implementation</a> 
-<li> <a href="sched_debug.html">Scheduling server: debugging</a> 
-<li> <a href="host_measure.html">Host measurements</a> 
-<li> <a href="rpc_policy.html">Scheduler RPC timing and retry policies</a> 
-<li> <a href="pers_file_xfer.html">Persistent file transfers</a>
-</ul>
-
-=======
 <h3>Implementation and debugging of BOINC</h3>
 <font size=-1>
 <dd> Read this to learn how to debug and enhance the BOINC software.
@@ -170,7 +95,6 @@ and collect the results.
 <li> <a href="pers_file_xfer.html">Persistent file transfers</a>
 </ul>
 
->>>>>>> 1.13
 <a href="http://sourceforge.net"><img
 src="http://sourceforge.net/sflogo.php?group_id=52437&amp;type=5"
 width="210" height="62" border="0" alt="SourceForge Logo"></a>