Fixing some merge problems on UserBLL and User model