finished pagination and preview
conflicts