Index: mergebot/trunk/mergebot/mergebotdaemon.py
===================================================================
--- mergebot/trunk/mergebot/mergebotdaemon.py	(revision 17)
+++ mergebot/trunk/mergebot/mergebotdaemon.py	(revision 18)
@@ -71,8 +71,12 @@
                     if task.action == 'merge' and task.version == self.version:
                         is_blocked = True
+                # A merge operation targeting our version blocks us
+                if task.action == 'merge' and task.version == self.version:
+                    is_blocked = True
                 # If there is another queued operation for this same ticket,
                 # that task blocks this one
                 if self.ticket == task.ticket:
                     is_blocked = True
+
                 if is_blocked:
                     self.blocked_by.append(task)