User registration is done
Conflict resolved