fix for pagination after merge