After-merge edits.