Merge files, add debug info