diff --git a/src/modules/postrename/filesystem/root/postrename b/src/modules/postrename/filesystem/root/postrename
index 8c3631887..0cef0f1f9 100644
--- a/src/modules/postrename/filesystem/root/postrename
+++ b/src/modules/postrename/filesystem/root/postrename
@@ -240,14 +240,11 @@ echo -en "${WHITE}Fix broken symlinks ...${NOC}\r"
 fix_broken_links
 fix_timelapse_links
 fix_mainsailcfg_links
-<<<<<<< HEAD
 # Optional if kiauh module is used
 if [[ -d "/home/${DEFAULT_USER}/kiauh" ]]; then
     fix_kiauh_links
 fi
-=======
 fix_cn_links
->>>>>>> develop
 echo -e "${WHITE}Fix broken symlinks ...${NOC}[${GRE}OK${NOC}]"
 ## do a short break
 sleep 2