diff --git a/de/home/.config/sway/config.d/input b/de/home/.config/sway/config.d/input
index d617bcb..5307d8e 100644
--- a/de/home/.config/sway/config.d/input
+++ b/de/home/.config/sway/config.d/input
@@ -7,6 +7,6 @@ input 1452:641:Apple_Internal_Keyboard_/_Trackpad {
 input 1160:4122:DELL0A36:00_0488:101A_Touchpad {
   natural_scroll enabled
   click_method clickfinger
-  tap enabled
+#  tap enabled
   dwt disabled
 }
diff --git a/de/home/.fonts/.uuid b/de/home/.fonts/.uuid
index 89779e5..e10e9b3 100644
--- a/de/home/.fonts/.uuid
+++ b/de/home/.fonts/.uuid
@@ -1 +1,5 @@
-6df779d0-d333-4b71-8dc1-d4ee94dea82a
\ No newline at end of file
+<<<<<<< HEAD
+6df779d0-d333-4b71-8dc1-d4ee94dea82a
+=======
+0a5e79e0-850d-415a-9020-229df17300de
+>>>>>>> b743e2d6d0b845c0d313c6e5aaf28b21d62e3d2d
diff --git a/de/home/.fonts/poppllaudatio-condensed.otf b/de/home/.fonts/poppllaudatio-condensed.otf
new file mode 100644
index 0000000..03d87b5
Binary files /dev/null and b/de/home/.fonts/poppllaudatio-condensed.otf differ