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