load->model problem solved
git status
Conflict in users_m.php resolved