Add "reuse recorded resolution" mode for conflict fixes.