diff --git a/.vscode/launch.json b/.vscode/launch.json
index f317667..48c4ad0 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -9,12 +9,8 @@
             "type": "lldb",
             "request": "launch",
             "program":"./build/bin/kirigami-hello",
-            "cwd":"$workspaceRoot",
-            "preRunCommands": [
-                "echo a",
-                "cmake -B build",
-                "cmake --build build"
-            ]
+            "cwd":"./",
+            "preLaunchTask": "CMake: build"
         }
     ],
 }
\ No newline at end of file
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
new file mode 100644
index 0000000..4edc48b
--- /dev/null
+++ b/.vscode/tasks.json
@@ -0,0 +1,16 @@
+{
+	"version": "2.0.0",
+	"tasks": [
+		{
+			"type": "cmake",
+			"label": "CMake: build",
+			"command": "build",
+			"targets": [
+				"all"
+			],
+			"group": "build",
+			"problemMatcher": [],
+			"detail": "CMake template build task"
+		}
+	]
+}
\ No newline at end of file
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4f97a9e..c6bd09e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -25,6 +25,7 @@ target_link_libraries(kirigami-hello
     KF6::I18n
     KF6::CoreAddons
     KF6::IconThemes
+    usb-1.0
 )
 
 install(TARGETS kirigami-hello ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/src/main.cpp b/src/main.cpp
index bb2519d..860f4f0 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -6,6 +6,8 @@
 #include <QQuickStyle>
 #include <QUrl>
 #include <QtQml>
+#include <libusb-1.0/libusb.h>
+#include <iostream>
 
 int main(int argc, char *argv[]) {
   KIconTheme::initTheme(); // this is not available in nixpkgs version of
@@ -31,8 +33,6 @@ int main(int argc, char *argv[]) {
     return -1;
   }
 
-<<<<<<< Updated upstream
-=======
   libusb_init(NULL);
   // discover devices
   libusb_device **list;
@@ -43,6 +43,5 @@ int main(int argc, char *argv[]) {
 
   libusb_free_device_list(list, 1);
 
->>>>>>> Stashed changes
   return app.exec();
 }