Currently the conflict resolver requires the user to choose to use either all asset values or all report values. If a user wants to keep most of the report values but not overwrite a few asset values, they will need to manually find the conflicting values in the report and update them to match asset values, then choose report values.

Instead, the user should be able to pick which conflicts to keep report values for, and which to keep asset values for. A third option to not update a particular value (keep the report as-is, and the asset as-is, for a particular field) should be an option in all instances. All-field selection (e.g. how it works now) should still be supported in some way, perhaps with a "select all" type selector at the top of a grid or something.