change userdata
fix merge