fix user save
fix merge conflict