Abstract: Pursuant to some embodiments, a system, method, apparatus, means and computer program code for resolving conflicts in a database system are provided where the system includes a plurality of client databases and a master database, each client database having a subset of data from the master database. Pursuant to some embodiments, conflicts are resolved by receiving a data change request message from a requesting client database, the data change request message including change information identifying a proposed change, row identification information, and a before image, and comparing the row identification information and the before image to corresponding information in the master database to identify a potential conflict.