add count for user lookup
resolve merge conflicts