Implemented User model
fixed conflicts