Update user_model.php

resolve conflict