updated users
fixed conflicts