Enable "reuse recorded resolution" to remember conflict resolutions