the branch ran away, so the second merge