diff --git a/.config/waybar/config.jsonc##hostname.viking-mate b/.config/waybar/config.jsonc##hostname.viking-mate
index 38c2ed9..0a18e50 100644
--- a/.config/waybar/config.jsonc##hostname.viking-mate
+++ b/.config/waybar/config.jsonc##hostname.viking-mate
@@ -1,140 +1,3 @@
-<<<<<<< HEAD
 [
   { "include": ["base.jsonc", "conf.d/laptop.jsonc"] }
 ]
-
-=======
-{
-  "layer": "bottom",
-  "output": [
-    "eDP-1",
-  ],
-  "position": "bottom",
-  "mod": "dock",
-  "exclusive": true,
-  "gtk-layer-shell": true,
-  "passthrough": false,
-  "height": 32,
-  "modules-left": [
-    "hyprland/workspaces"
-  ],
-  "modules-center": [
-    "privacy"
-  ],
-  "modules-right": [
-    "cpu",
-    "memory",
-    "disk",
-    "network",
-    "pulseaudio",
-    "bluetooth",
-    "battery",
-    "custom/alhp",
-    "custom/razer-mouse-battery",
-    "tray",
-    "clock",
-  ],
-  "hyprland/workspaces": {
-    "icon-size": 28,
-    "spacing": 12,
-    "on-scroll-up": "hyprctl dispatch workspace r+1",
-    "on-scroll-down": "hyprctl dispatch workspace r-1",
-  },
-  "cpu": {
-    "interval": 5,
-    "format": "<span color=\"#4F84CC\"></span>  <span color=\"#CAD3E8\">{usage}%</span>",
-  },
-  "memory": {
-    "interval": 10,
-    "format": "<span color=\"#4F84CC\"></span>  <span color=\"#CAD3E8\">{percentage}%</span>",
-    "tooltip": true,
-  },
-  "disk": {
-    "interval": 30,
-    "format": "<span color=\"#4F84CC\">󰋊</span>  <span color=\"#CAD3E8\">{percentage_used}%</span>",
-    "tooltip": true,
-  },
-  "mpris": {
-    "format": "{player_icon} {dynamic}",
-    "format-paused": "{status_icon} <i>{dynamic}</i>",
-    "dynamic-len": 50,
-    "ellipsis": "…",
-    "player-icons": {
-      "default": "▶",
-      "mpv": "🎵",
-    },
-    "status-icons": {
-      "paused": "⏸",
-    },
-  },
-  "network": {
-    "format-wifi": "<span color=\"#4F84CC\"></span>  <span color=\"#CAD3E8\">{essid} ({signalStrength}%)</span>",
-    "format-ethernet": "<span color=\"#4F84CC\"></span>  <span color=\"#CAD3E8\">{ifname}</span>",
-    "format-disconnected": "<span color=\"#FFCC33\">󰌙  Disconnected</span>",
-    "tooltip": true,
-    "tooltip-format": "<span color=\"#CAD3E8\">{ifname} via {gwaddr}</span>",
-  },
-  "pulseaudio": {
-    "format": "<span color=\"#4F84CC\">{icon}</span>  <span color=\"#CAD3E8\">{volume}%</span>",
-    "format-muted": "<span color=\"#FFCC33\">  Muted</span>",
-    "scroll-step": 5,
-    "on-click": "pavucontrol",
-    "interval": 30,
-    "format-icons": {
-      // match these to the sink NAMES you see in `pactl list sinks`
-      "alsa_output.usb-SteelSeries_Arctis_7_-00.analog-stereo": "", // SteelSeries headset
-      "alsa_output.pci-0000_0a_00.4.iec958-stereo": "", // speaker icon for your soundbar
-      "bluez_output.50_5E_5C_2D_F3_B2.1": "", // Bluetooth earbud icon
-      "default": [
-        "",
-        ""
-      ], // fallback (low/hi)
-    },
-  },
-  "bluetooth": {
-    "format": "<span color=\"#4F84CC\"></span>  <span color=\"#CAD3E8\">{status}</span>",
-    "format-connected": "<span color=\"#4F84CC\"></span>  <span color=\"#CAD3E8\">{device_alias} ({device_battery_percentage}%)</span>",
-  },
-  "battery": {
-    "states": {
-      "good": 95,
-      "warning": 30,
-      "critical": 20,
-    },
-    "format": "<span color=\"#4F84CC\">{icon}</span>  <span color=\"#CAD3E8\">{capacity}%</span>",
-    "format-charging": "<span color=\"#4F84CC\"> {capacity}%</span>",
-  },
-  "custom/alhp": {
-    "exec": "$HOME/.config/waybar/scripts/alhp.sh",
-    "return-type": "json",
-    "interval": 60,
-    "format": "{text}",
-    "tooltip": true,
-  },
-  "custom/razer-mouse-battery": {
-    "exec": "$HOME/.config/waybar/scripts/razer_basilisk_v3_pro_battery_info.sh",
-    "return-type": "json",
-    "interval": 10,
-    "format": "{text}",
-    "tooltip": true,
-  },
-  "tray": {
-    "icon-size": 18,
-    "spacing": 4,
-  },
-  "clock": {
-    "format": "<span color=\"#CAD3E8\">{:%R | %d.%m.%Y}</span>",
-    "tooltip-format": "<tt><span color=\"#CAD3E8\"><small>{calendar}</small></span></tt>",
-    "calendar": {
-      "mode": "year",
-      "mode-mon-col": 3,
-      "weeks-pos": "right",
-    },
-    "actions": {
-      "on-click-right": "mode",
-      "on-scroll-up": "shift_up",
-      "on-scroll-down": "shift_down",
-    },
-  },
-}
->>>>>>> f130af1 (config stash laptop)