diff --git a/annotation-queue/offset.yaml b/annotation-queue/offset.yaml
index 0020fb5..54db970 100644
--- a/annotation-queue/offset.yaml
+++ b/annotation-queue/offset.yaml
@@ -1,5 +1 @@
-<<<<<<< HEAD
-offset_queue: 108
-=======
-offset_queue: 34
->>>>>>> e3a53f8 (put test folders to config.yaml for queue)
+offset_queue: 1