Index: mergebot/trunk/utils/test.py
===================================================================
--- mergebot/trunk/utils/test.py	(revision 54)
+++ mergebot/trunk/utils/test.py	(revision 56)
@@ -112,5 +112,5 @@
         tc.find('CheckMerge')
         self.go_to_ticket(ticket_id)
-        tc.find('Rebranched from .* for .*')
+        tc.find('(Rebranched from .* for .*|There were conflicts on rebranching)')
         retval = call(['svn', 'ls', self.repo_url + '/' + component + '/branches/ticket-%s' % ticket_id],
                     stdout=logfile, stderr=logfile)