writing tests for pagination
resolving conflict