diff --git a/content/datenspuren/fahrplan.xml b/content/datenspuren/fahrplan.xml
index 1def5eae6..970c470ae 100644
--- a/content/datenspuren/fahrplan.xml
+++ b/content/datenspuren/fahrplan.xml
@@ -2,16 +2,6 @@
 <!DOCTYPE page SYSTEM "http://www.c3d2.de/dtd/c3d2web.dtd">
 
 <page title="Fahrplan">
-<<<<<<< HEAD
-        <include src="../static/datenspuren/fahrplan/index.de.htlm"/>
-        <!--<include-pentabarf-schedule src="../static/datenspuren/fahrplan/index.de.html"/>-->
-        <!--<p>
-                <link href="https://cccv.pentabarf.org/submission/ds2011">Einreichungen für DS2011</link>
-        </p>-->
-        <!-- <include-pentabarf-schedule src="../static/datenspuren/fahrplan/day/2010-10-16.de.html"/>
-  <include-pentabarf-schedule src="../static/datenspuren/fahrplan/day/2010-10-17.de.html"/>-->
-=======
   <include-pentabarf-schedule src="../static/datenspuren/fahrplan/day_2011-10-15.de.html"/>
   <include-pentabarf-schedule src="../static/datenspuren/fahrplan/day_2011-10-16.de.html"/>
->>>>>>> 22946d0136ab177d90228ec5a4cfb20142312f89
 </page>