conflictResolvingModel