fixed paginate and admin views
fixed merge