oops, merge-mode 1 fix wasn't finished because I was handling the first file under merge-mode 4 for performance reasons...