Adds data conflict detection