fix merge issue: the counter holder got blown away when resolving conflicts