Fix incorrect listing of records from to count
Fix merge conflict