diff --git a/.config/sway/config b/.config/sway/config
index f3a4def..8d182fb 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -98,9 +98,6 @@ bar {
 exec blueman-applet
 exec nm-applet --indicator
 exec rocketchat-desktop --start-hidden
-<<<<<<< HEAD
-exec sleep 10s; nextcloud --background
-=======
-exec sleep 10s; keepassxc
+exec sleep 10s
 exec nextcloud --background
->>>>>>> 7300811 (add keepassw to start and add timer for nextcloud)
+exec keepassxc