Abstract: A method and system for automatically resolving data conflicts in a shared data environment where a plurality of users can concurrently access at least portions of a master data file is presented. Users process data files by means of local copies of a master data file. When an attempted update of a master data file with an edited data file from a user is detected, the updating file is analyzed to determine if any changes made are in conflict with changes made to the master data file by a second user. If a conflict is detected, it is resolved by merging the updating file into the master file according to a predefined set of rules. For conflicts which are not resolved by rule-based reconciliation, at least one user is notified of the conflict and presented with conflict resolving information and the conflict is resolved according to user input.