diff --git a/COMBO_MO_MOBIL.htm b/COMBO_MO_MOBIL.htm
index faff36e..650b958 100644
--- a/COMBO_MO_MOBIL.htm
+++ b/COMBO_MO_MOBIL.htm
@@ -67,11 +67,7 @@
 		#week      { page-break-after: always; }
 		div#outgoing:not(:first-child) { display: none; }
 	</style>
-<<<<<<< HEAD
-    <!--@JS-DATA@--><script>const myDATA ={'15.04.24': ['5', 'Russisch', '0', ' - 14:30 Uhr', '1', ' - Sam. Zielke', '1', ' - 09:30 Uhr', '1', ' - Pet. Dörsam', '4', ' - 14:00 Uhr', '2', ' - Fre. Schlöffel', '5', ' - 09:30 Uhr', '2', ' - Fri. Schlöffel', '', '', '', '', '', '', '', '', 'Fre. Schlöffel', 'Jür. Zielke', 'Gar. George', 'Axe. Hahn', 'Sam. Zielke', 'Dan. Zielke', 'Tal. Hahn', 'Erw. Gert', 'Jür. Zielke']}</script>
-=======
     <!--@JS-DATA@--><script>const myDATA ={'15.04.24': ['', '5', 'Russisch', '0', ' - 14:30 Uhr', '1', ' - Samuel Zielke', '1', ' - 09:30 Uhr', '1', ' - Peter Dörsam', '4', ' - 14:00 Uhr', '2', ' - Fred Schlöffel', '5', ' - 09:30 Uhr', '2', ' - Friedhelm Schlöffel', '', '', '', '', '', '', '', '', 'Fred Schlöffel', 'Jürgen Zielke', 'Gary George', 'Axel Hahn', 'Samuel Zielke', 'Daniel Zielke', 'Talita Hahn', 'Erwin Gert', 'Jürgen Zielke']}</script>
->>>>>>> c9e17913a37f4e56ea93b0e712706aa09e50f831
 	
 </head>
 
@@ -677,30 +673,4 @@
 	</script>
 </body>
 
-<<<<<<< HEAD
-</html></html>>ATA[window.weekdate[weeklistpos]][myIndex] != "") {
-
-						element.innerHTML = service_type[myDATA[window.weekdate[weeklistpos]][myIndex]-1];
-
-					} 
-					else {
-
-						element.innerHTML = myDATA[window.weekdate[weeklistpos]][myIndex];
-
-					}
-				
-				}
-				myIndex = myIndex + 1;
-		});
-		}
-		
-		setData(myDATA)
-	</script>
-</body>
-
-</html></html>>
-=======
-</html>y>
-
-</html>
->>>>>>> c9e17913a37f4e56ea93b0e712706aa09e50f831
+</html>
\ No newline at end of file