fix counter_cache_spec merge errors