US Patent 11126610 Conflict resolution in a data proxy

A technology is provided for conflict resolution in a data proxy for a mutation. A mutation may be received at a data proxy from an application, and the data proxy is in a service provider environment. The mutation may be sent to be processed by a data store via a data access resolver. A conflict message may be received at the data proxy via the data access resolver for a conflict mutation at the data store for the mutation. The conflict may be resolved at the data proxy using a conflict resolution function in the data proxy.