Added validation for user uniqueness
Resolved conflicts