diff --git a/assets/resources/Manifest b/assets/resources/Manifest
index ab4abb2ae..05c07fac0 100644
--- a/assets/resources/Manifest
+++ b/assets/resources/Manifest
@@ -1,9 +1,5 @@
 V:0
-<<<<<<< HEAD
 T:1657662154
-=======
-T:1657672575
->>>>>>> dev
 D:badusb
 D:dolphin
 D:infrared