diff --git a/public/satellitenhimmel.php b/public/satellitenhimmel.php
index e8595d7..11ec0e6 100644
--- a/public/satellitenhimmel.php
+++ b/public/satellitenhimmel.php
@@ -620,14 +620,9 @@ if (!empty($currentLocation) && is_array($currentLocation)) {
         }
 
         function azToDirectionName(az) {
-<<<<<<< HEAD
           const displayAz = getDisplayedAzimuthDeg(az);
           const dirs = ['Norden','Nordwesten','Westen','Suedwesten','Sueden','Suedosten','Osten','Nordosten'];
           return dirs[Math.round(displayAz/45) % 8];
-=======
-          const dirs = ['Norden','Nord Osten','Osten','Süd Osten','Süden','Süd Westen','Westen','Nord Westen'];
-          return dirs[Math.round(az/45) % 8];
->>>>>>> 65be4bdf9b70b6b4f405d70e52ef7c99c1bcb498
         }
 
         function altitudeToPhrase(el) {