counters t2 merge bug reparation