diff --git a/1-setup.sh b/1-setup.sh
index 8d7bbef..1c0afa8 100755
--- a/1-setup.sh
+++ b/1-setup.sh
@@ -48,6 +48,10 @@ localectl --no-ask-password set-locale LANG="$LOCALE" LC_TIME="$LOCALE"
 localectl --no-ask-password set-keymap --no-convert "$KEYMAP"
 
 # Add sudo no password rights
+<<<<<<< HEAD
+=======
+sed -i 's/^# %wheel ALL=(ALL) NOPASSWD: ALL/%wheel ALL=(ALL) NOPASSWD: ALL/' /etc/sudoers
+>>>>>>> 44fb72cfdf009a9815f39848bc8aa7d8f7c8321b
 sed -i 's/^# %wheel ALL=(ALL:ALL) NOPASSWD: ALL/%wheel ALL=(ALL:ALL) NOPASSWD: ALL/' /etc/sudoers
 
 #Add parallel downloading
diff --git a/3-post-setup.sh b/3-post-setup.sh
index 599361e..3874f7c 100755
--- a/3-post-setup.sh
+++ b/3-post-setup.sh
@@ -55,6 +55,7 @@ echo -ne "
 -------------------------------------------------------------------------
 "
 systemctl enable cups.service
+systemctl enable cronie.service
 ntpd -qg
 systemctl enable ntpd.service
 systemctl disable dhcpcd.service
@@ -67,9 +68,14 @@ echo -ne "
 -------------------------------------------------------------------------
 "
 # Remove no password sudo rights
+<<<<<<< HEAD
+=======
+sed -i 's/^%wheel ALL=(ALL) NOPASSWD: ALL/# %wheel ALL=(ALL) NOPASSWD: ALL/' /etc/sudoers
+>>>>>>> 44fb72cfdf009a9815f39848bc8aa7d8f7c8321b
 sed -i 's/^%wheel ALL=(ALL:ALL) NOPASSWD: ALL/# %wheel ALL=(ALL:ALL) NOPASSWD: ALL/' /etc/sudoers
 # Add sudo rights
 sed -i 's/^# %wheel ALL=(ALL) ALL/%wheel ALL=(ALL) ALL/' /etc/sudoers
+sed -i 's/^# %wheel ALL=(ALL:ALL) ALL/%wheel ALL=(ALL:ALL) ALL/' /etc/sudoers
 
 rm -r /root/ArchTitus
 rm -r /home/"$USERNAME"/ArchTitus
diff --git a/archtitus.sh b/archtitus.sh
index df866f8..f27c2a5 100755
--- a/archtitus.sh
+++ b/archtitus.sh
@@ -25,6 +25,7 @@ logo() {
 ██║  ██║██║  ██║╚██████╗██║  ██║   ██║   ██║   ██║   ╚██████╔╝███████║
 ╚═╝  ╚═╝╚═╝  ╚═╝ ╚═════╝╚═╝  ╚═╝   ╚═╝   ╚═╝   ╚═╝    ╚═════╝ ╚══════╝
 "
+<<<<<<< HEAD
 }
 
 sequence() {
@@ -35,12 +36,32 @@ sequence() {
         echo "ERROR! Missing file: setup.conf"
         exit 1
     fi
+=======
+#!/bin/bash
+if awk -F/ '$2 == "docker"' /proc/self/cgroup | read; then
+    echo -ne "docker container found script can't install (at the moment)"
+else
+    bash startup.sh
+    source $SCRIPT_DIR/setup.conf
+>>>>>>> 44fb72cfdf009a9815f39848bc8aa7d8f7c8321b
     bash 0-preinstall.sh
     arch-chroot /mnt /root/ArchTitus/1-setup.sh
     arch-chroot /mnt /usr/bin/runuser -u "$USERNAME" -- /home/"$USERNAME"/ArchTitus/2-user.sh
     arch-chroot /mnt /root/ArchTitus/3-post-setup.sh
+<<<<<<< HEAD
     logo
     echo -ne "
+=======
+fi
+echo -ne "
+-------------------------------------------------------------------------
+   █████╗ ██████╗  ██████╗██╗  ██╗████████╗██╗████████╗██╗   ██╗███████╗
+  ██╔══██╗██╔══██╗██╔════╝██║  ██║╚══██╔══╝██║╚══██╔══╝██║   ██║██╔════╝
+  ███████║██████╔╝██║     ███████║   ██║   ██║   ██║   ██║   ██║███████╗
+  ██╔══██║██╔══██╗██║     ██╔══██║   ██║   ██║   ██║   ██║   ██║╚════██║
+  ██║  ██║██║  ██║╚██████╗██║  ██║   ██║   ██║   ██║   ╚██████╔╝███████║
+  ╚═╝  ╚═╝╚═╝  ╚═╝ ╚═════╝╚═╝  ╚═╝   ╚═╝   ╚═╝   ╚═╝    ╚═════╝ ╚══════╝
+>>>>>>> 44fb72cfdf009a9815f39848bc8aa7d8f7c8321b
 -------------------------------------------------------------------------
                     Automated Arch Linux Installer
 -------------------------------------------------------------------------
diff --git a/pkg-files/aur-pkgs.txt b/pkg-files/aur-pkgs.txt
index 17ae4d8..b15a19d 100644
--- a/pkg-files/aur-pkgs.txt
+++ b/pkg-files/aur-pkgs.txt
@@ -3,7 +3,6 @@ brave-bin
 dxvk-bin
 github-desktop-bin
 lightly-git
-lightlyshaders-git
 mangohud
 mangohud-common
 nerd-fonts-fira-code