Server side changes
Conflict resolution