created users
fixed conflicts