<h2>Save merge not saving after adding the code of the base system to customised code while resolving conflicts.</h2><br/><div style="overflow-x:auto"><article><div ><h3 >Issue </h3><section><ol style="list-style-position: inside;"><li>Whenever we try to save merge the conflicts after pushing the base system code to the customized code then it in fact doesn't save the merge.</li><li>Steps to reproduce, first de-activate the UI Action having name "sysverb_update" and action name sysverb_update (having sys_id 42df02e20a0a0b340080e61b551f2909)<br />- Login to instance.<br />- Goto upgrade history under System Diagnostics<br />- Choose a record from the "Skipped changes to review" related list or maybe from any of the available related list having the Skipped as its desposition.<br />- Click on the resolve conflicts.<br />- Add the code from the base system side to customized side.<br />- Click save merge.<br />- Then refresh the same record you will notice the code is not merged.</li></ol></section></div><div ><h3 >Release</h3><section><ul style="list-style-position: inside;"><li>Happens in all the environments.</li></ul></section></div><div ><h3 >Cause</h3><section><ul style="list-style-position: inside;"><li>If the UI action having name "Update" and action name sysverb_update (having sys_id 42df02e20a0a0b340080e61b551f2909) is inactive it won't let the merges to be saved after the resolve conflicts.</li></ul></section></div><div ><h3 >Resolution</h3><section><ul style="list-style-position: inside;"><li>Make the UI Action having name "update" and action name having sys_id(42df02e20a0a0b340080e61b551f2909) active and re-try to resolve the conflicts and save the merge.</li></ul></section></div></article></div>