fix user model
fix merge conflicts