edit user
fix merge bug