Abstract: A centralized datastore maintained by a service provider may maintain current versions of objects (e.g., applications, documents, websites, etc.). A local datastore residing on user devices of users may maintain local versions of the objects. A user may submit a modification to the object and, upon determining that a version of the local object is the same as the version of current version of the object, a current version of the object may be updated to include the modification. If the version and the current version are different, individual fields of the object may be analyzed to determine if the modification involves a change to data that conflicts with data within the same field in the current version of the object. If not, the objects may be merged and the current version of the object may be updated to include the modification. Otherwise, the modification will be rejected.