user and player models
fixed conflicts