Rollback and added fix for conflict between updateing a user'