Finishing user registration and email validation
Resolving conflicts