fixing login
working on pagination
fixed merge