* Correct treatment of conflicts and synchronization when data has been locally changed and is being server synched