fixing merge issue with visible count