Add test for Entry.merge
Fix Entry.merge to be sorted in DESC count order