diff --git a/.cargo/config.toml b/.cargo/config.toml
index 5798c45..16df86f 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -1,11 +1,3 @@
-[build]
-target = "armv7-unknown-linux-gnueabihf"
-rustflags = ["-C", "target-feature=+crt-static"]
-
-[alias]
-test_pc = "test --target=x86_64-unknown-linux-gnu"
-build_pc = "build --target=x86_64-unknown-linux-gnu"
-
-
 [target.armv7-unknown-linux-gnueabihf]
 linker = "arm-linux-gnueabihf-gcc"
+rustflags = ["-C", "target-feature=+crt-static"]
diff --git a/make.sh b/make.sh
index 98eae07..1a248b8 100755
--- a/make.sh
+++ b/make.sh
@@ -1,10 +1,4 @@
-<<<<<<< Updated upstream
-cargo build --release
-adb push target/armv7-unknown-linux-gnueabihf/release/rayhunter /data/rayhunter/rayhunter
+#!/bin/sh
+cargo build --release --target="armv7-unknown-linux-gnueabihf" --bin rayhunter-daemon
+adb push target/armv7-unknown-linux-gnueabihf/release/rayhunter-daemon /data/rayhunter/
 adb shell '/bin/rootshell -c "/etc/init.d/rayhunter_daemon restart"'
-=======
-# the "arm" profile inherits from "release", so this is an optimized build
-cargo build --profile arm
-adb push target/arm/rayhunter-daemon /data/rayhunter/
-adb shell '/bin/rootshell -c "/etc/init.d/rayhunter_daemon restart"'
->>>>>>> Stashed changes