Database changes
Resolving conflicts
UUID for users