the paginator tag
fix conflicts