diff --git a/main.go b/main.go
index 64d2966..23b4171 100644
--- a/main.go
+++ b/main.go
@@ -179,11 +179,7 @@ func fetchAndSave(client *http.Client, t target, outDir string) error {
 // Import-Logik
 func importBlocklists() error {
 	client := &http.Client{Timeout: 60 * time.Second}
-<<<<<<< HEAD
 	t := target{Name: "Catalog", URL: os.Getenv("FLOD_IMPORT_URL") + "/lists.json"}
-=======
-	t := target{Name: "Catalog", URL: "http://flodimporter:8080/lists.json"}
->>>>>>> 95e14caeb60edc10c73d9cb60985caa118ed2a38
 	if err := os.MkdirAll("./lists/", 0o755); err != nil {
 		fmt.Println("creating output dir", err)
 	}