merge: do not mistake (ancestor of) tag for branch