Resolve conflict feature is not working after plugin update "Unable to find the base records" error messageIssue <!-- /*NS Branding Styles*/ --> .ns-kb-css-body-editor-container { p { font-size: 12pt; font-family: Lato; color: #000000; } span { font-size: 12pt; font-family: Lato; color: #000000; } h2 { font-size: 24pt; font-family: Lato; color: black; } h3 { font-size: 18pt; font-family: Lato; color: black; } h4 { font-size: 14pt; font-family: Lato; color: black; } a { font-size: 12pt; font-family: Lato; color: #00718F; } a:hover { font-size: 12pt; color: #024F69; } a:target { font-size: 12pt; color: #032D42; } a:visited { font-size: 12pt; color: #00718f; } ul { font-size: 12pt; font-family: Lato; } li { font-size: 12pt; font-family: Lato; } img { display: ; max-width: ; width: ; height: ; } } After updating found that several of conflicts cannot be easily resolved, because the "resolve" feature is showing "Unable to find the base records" error message. Release<!-- /*NS Branding Styles*/ --> .ns-kb-css-body-editor-container { p { font-size: 12pt; font-family: Lato; color: #000000; } span { font-size: 12pt; font-family: Lato; color: #000000; } h2 { font-size: 24pt; font-family: Lato; color: black; } h3 { font-size: 18pt; font-family: Lato; color: black; } h4 { font-size: 14pt; font-family: Lato; color: black; } a { font-size: 12pt; font-family: Lato; color: #00718F; } a:hover { font-size: 12pt; color: #024F69; } a:target { font-size: 12pt; color: #032D42; } a:visited { font-size: 12pt; color: #00718f; } ul { font-size: 12pt; font-family: Lato; } li { font-size: 12pt; font-family: Lato; } img { display: ; max-width: ; width: ; height: ; } } Yokohama, Zurich Resolution<!-- /*NS Branding Styles*/ --> .ns-kb-css-body-editor-container { p { font-size: 12pt; font-family: Lato; color: #000000; } span { font-size: 12pt; font-family: Lato; color: #000000; } h2 { font-size: 24pt; font-family: Lato; color: black; } h3 { font-size: 18pt; font-family: Lato; color: black; } h4 { font-size: 14pt; font-family: Lato; color: black; } a { font-size: 12pt; font-family: Lato; color: #00718F; } a:hover { font-size: 12pt; color: #024F69; } a:target { font-size: 12pt; color: #032D42; } a:visited { font-size: 12pt; color: #00718f; } ul { font-size: 12pt; font-family: Lato; } li { font-size: 12pt; font-family: Lato; } img { display: ; max-width: ; width: ; height: ; } } Found the issue is related to a known product defect:PRB1766663 Skipped Records - Getting "Unable to find the base record" message when attempting to Resolve ConflictsThere is workaround in the PRB where part of the URL is removed to allow "Resolve Conflicts" to work. These steps allow "Resolve Conflicts" to work:- Open skipped customization record - Try to click "resolve conflicts"- Which opens here with the message "Unable to find the base record".- Remove this part of the URL &sysparm_basechanged=true&sysparm_referring_url=- Resolve Conflicts opens and shows there are no differences.Our development team have confirmed that for the skipped record the Resolution field shows “Reviewed and Reverted.” This indicates that the upgrade change for this Script Include was reviewed earlier, and the system kept the existing version on the instance. Because of that, Resolve Conflicts correctly shows “There are no differences” for this record.For additional information please review this documentation for managing skipped records:- Servicenow documentation:Process the skipped records listhttps://www.servicenow.com/docs/bundle/xanadu-platform-administration/page/administer/platform-upgrades/task/upgrademon-process-skip-list.html- Servicenow Community documentation: best practice for managing skipped records:Best Practices to manage skipped updates effectively during upgradeshttps://www.servicenow.com/community/developer-blog/best-practices-to-manage-skipped-updates-effectively-during/ba-p/3421456What is the best practice to review Skipped Records after upgradehttps://www.servicenow.com/community/developer-forum/what-is-the-best-practice-to-review-skipped-records-after/m-p/2410207