edit users
my sql
fixed conflicts