diff --git a/config.yml b/config.yml
index da396cb1bc195342fd30dbe0e5a721af8bdee05f..c304405dccbcec2393307773d9946f5e94d47a7b 100644
--- a/config.yml
+++ b/config.yml
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 baseURL: "https://gerstorfer.gitlab.io/myproject/"
-=======
-baseURL: https://gerstorfer.gitlab.io/myproject/
 languageCode: en-us
->>>>>>> a9d719972840bb823598917f60efa42c71732aa7
 theme: "PaperMod"
 title: My New Hugo Site