diff --git a/plasma/customizeChroot b/plasma/customizeChroot
index 25b7f782b08b0371afd6650d22e3812634579812..b130db475564ac70923af7827334e19e398f8de8 100755
--- a/plasma/customizeChroot
+++ b/plasma/customizeChroot
@@ -81,42 +81,5 @@ config_66(){
 }
 custo_once config_66
 
-<<<<<<< HEAD
-=======
-config_user(){
-
-    out_action "Create ${NEWUSER} .scandir file"
-    su "${NEWUSER}" -c "cat > /home/${NEWUSER}/.scandir <<EOF
-#!/usr/bin/execlineb -P
-#emptyenv -p
-s6-setsid -qb --
-umask 022
-
-66-scandir -v3 -cu
-EOF"
-    out_action "Set 750 permissions on .scandir file"
-    su "${NEWUSER}" -c "chmod 750 /home/${NEWUSER}/.scandir"
-    
-    out_action "Create ${NEWUSER} .zprofile file"
-    su "${NEWUSER}" -c "cat > /home/${NEWUSER}/.zprofile <<EOF
-## Execute scandir script
-## Send a down signal, or 'could not sync environment to dbus' with sddm when user logout/login 
-## Send an up signal for services inside tree [gui]
-
-(.scandir &) &
-66-all -t gui down
-sleep 01
-66-all -t gui up
-EOF"
-
-    out_action "Create ${NEWUSER} .xinitrc file"
-    su "${NEWUSER}" -c "cat > /home/${NEWUSER}/.xinitrc <<EOF
-## Uncomment if you use startx command line to launch plasma DE
-exec ck-launch-session startkde
-EOF"
-}
-custo_once config_user
-
->>>>>>> 7200a72... update with ck-launch-session
 out_valid "Customization terminate"