updating user
fix merge error