JAS uses CRDTs (Conflict-free Replicated Data Types) for conflict resolution. CRDTs ensure that everyone eventually sees the same state. For more complex apps, developers can access the full edit history to build app-specific conflict resolution mechanisms.