update user yaml
fix conflict