Correct the local conflict parser consuming context beyond the selected hunk. Preserve all baseline entries and add only the selected T3 and removal scaffold rows. (cherry picked from commit 473713413a9132375b6bf96627e8220f118ddf00)