diff --git a/.hugo-params b/.hugo-params
index 2ef16a1..10e707e 100644
--- a/.hugo-params
+++ b/.hugo-params
@@ -1,5 +1 @@
-<<<<<<< HEAD
 --baseURL=https://berlin.ccc.de/
-=======
---baseURL=https://berlin.ccc.de/
->>>>>>> staging